新增-组织机台授权接口，机台数据源接口，逻辑更改-柜体删除，还原关联排单，包裹部分数据更改，排单部分异常信息返回补全

cf-module-system/cf-module-system-biz/src/main/resources/mapper/machine/MachineLimitMapper.xml

@@ -7,24 +7,28 @@
 
 
 
-        select sml.*
+        select distinct
+            sml.organ_id,
+            sml.cut_limit,
+            sml.drill_limit,
+            sml.label_limit,
+            sml.saw_limit,
+            sml.sealedge_limit,
+            sml.updater,
+            sml.update_time,
+            so.name as organName,
+            so.status
         from system_machine_limit sml
-
-                 left join system_organization so on sml.organ_id = so.id
-                 left join system_machine_template smt on sml.setting like concat(smt.id, '%')
+             join system_organization so on sml.organ_id = so.id
         <where>
             sml.deleted = false
-          and smt.deleted = false
-          and smt.is_enabled = true
-          and smt.is_default = false
-          and so.status = 0
 
-        <if test="machinePage.organName !=null">
-            and so.name like concat('%', #{machinePage.organName},'%')
+        <if test="machinePage.organId !=null">
+            and sml.organ_id = #{machinePage.organId}
         </if>
 
-        <if test="machinePage.machineName !=null">
-            and smt.name like concat('%', #{machinePage.machineName},'%')
+        <if test="machinePage.status !=null">
+            and so.status = #{machinePage.status}
         </if>
 
         </where>

cf-module-system/cf-module-system-biz/src/main/resources/mapper/organ/OrganMapper.xml

@@ -21,9 +21,9 @@
 
 
 
-    <select id="selectTestSQL" resultType="com.cf.imes.module.system.dal.dataobject.organ.OrganizationDO">
+    <select id="selectOrganDataSource" resultType="java.util.Map">
 
-        ${sql}
+        select ${filed}  from system_organization where id = #{organId}  and deleted = false
 
     </select>
 

cf-module-system/cf-module-system-biz/src/main/resources/mapper/process/AdminUserMapper.xml

@@ -38,4 +38,19 @@
         ORDER BY
             id DESC
     </select>
+
+
+    <select id="selectUserDataSource" resultType="java.util.Map">
+
+        select ${filed}
+        from system_users
+        where organ_id =  #{organId}
+          and deleted = false
+          and nickname in
+        <foreach collection="nameList" item="nameList" open="(" close=")" separator=",">
+            #{nameList}
+        </foreach>
+
+
+    </select>
 </mapper>

cf-module-system/cf-module-system-biz/src/main/resources/mapper/process/MachineMapper.xml

@@ -16,4 +16,10 @@
 
 
     </select>
+
+    <select id="selectMachineDataSource" resultType="java.util.Map">
+
+        select ${filed}  from system_machine where organ_id = #{organId} and deleted = false and id = #{machineId}
+
+    </select>
 </mapper>