工单查询参数调整

ygtx-gxt/src/main/java/com/ygtx/gxt/service/impl/GxtOrderScoreServiceImpl.java

@@ -1822,6 +1822,12 @@ public class GxtOrderScoreServiceImpl implements IGxtOrderScoreService {
             if (workOrder.getCreateBy() == null || workOrder.getCreateBy().isEmpty()) {
                 workOrder.setCreateBy(userName);
             }
+            if (repairOrder.getParams().get("currentUser") == null) {
+                repairOrder.getParams().put("currentUser", SecurityUtils.getUsername());
+            }
+            if (workOrder.getParams().get("currentUser") == null) {
+                workOrder.getParams().put("currentUser", SecurityUtils.getUsername());
+            }
         }
         // 查询工单列表
         return gxtOrderScoreMapper.selectMobileUnionOrderList(repairOrder, workOrder,keyword);

ygtx-gxt/src/main/java/com/ygtx/gxt/service/impl/GxtRepairOrderServiceImpl.java

@@ -134,8 +134,8 @@ public class GxtRepairOrderServiceImpl implements IGxtRepairOrderService
 
         if(!Constants.SUPER_ADMIN.equals(SecurityUtils.getUsername())){
             // 确保设置了当前用户的用户名，用于待下发工单的权限过滤
-            if (gxtRepairOrder.getCreateBy() == null || gxtRepairOrder.getCreateBy().isEmpty()) {
-                gxtRepairOrder.setCreateBy(SecurityUtils.getUsername());
+            if (gxtRepairOrder.getParams().get("currentUser") == null) {
+                gxtRepairOrder.getParams().put("currentUser", SecurityUtils.getUsername());
             }
         }
 

ygtx-gxt/src/main/java/com/ygtx/gxt/service/impl/GxtWorkOrderServiceImpl.java

@@ -120,8 +120,8 @@ public class GxtWorkOrderServiceImpl implements IGxtWorkOrderService
 
         if(!Constants.SUPER_ADMIN.equals(SecurityUtils.getUsername())){
             // 确保设置了当前用户的用户名，用于待下发工单的权限过滤
-            if (gxtWorkOrder.getCreateBy() == null || gxtWorkOrder.getCreateBy().isEmpty()) {
-                gxtWorkOrder.setCreateBy(SecurityUtils.getUsername());
+            if (gxtWorkOrder.getParams().get("currentUser") == null) {
+                gxtWorkOrder.getParams().put("currentUser", SecurityUtils.getUsername());
             }
         }
 

ygtx-gxt/src/main/resources/mapper/gxt/GxtOrderScoreMapper.xml

@@ -318,11 +318,11 @@
                 ${repairOrder.params.businessDataScope}
             </if>
             <!-- 限制待下发工单只能创建人本部门查看 -->
-            <if test="repairOrder.createBy != null and repairOrder.createBy != ''">
+            <if test="repairOrder.params.currentUser != null and repairOrder.params.currentUser != ''">
                 and ((t.work_order_status != 'to_issue' and t.work_order_status != 'accept_return') or t.create_by in
                     (select user_name from sys_user t1
                      left join sys_dept t2 on t1.dept_id = t2.dept_id
-                     where t2.dept_id = (select dept_id from sys_user where user_name = #{repairOrder.createBy,jdbcType=VARCHAR} and del_flag='0')))
+                     where t2.dept_id = (select dept_id from sys_user where user_name = #{repairOrder.params.currentUser,jdbcType=VARCHAR} and del_flag='0')))
             </if>
         </where>
 
@@ -414,11 +414,11 @@
                 ${workOrder.params.businessDataScope}
             </if>
             <!-- 限制待下发工单只能创建人本部门查看 -->
-            <if test="workOrder.createBy != null and workOrder.createBy != ''">
+            <if test="workOrder.params.currentUser != null and workOrder.params.currentUser != ''">
                 and ((t.work_order_status != 'to_issue' and t.work_order_status != 'accept_return') or t.create_by in
                 (select user_name from sys_user t1
                 left join sys_dept t2 on t1.dept_id = t2.dept_id
-                where t2.dept_id = (select dept_id from sys_user where user_name = #{workOrder.createBy,jdbcType=VARCHAR} and del_flag='0')))
+                where t2.dept_id = (select dept_id from sys_user where user_name = #{workOrder.params.currentUser,jdbcType=VARCHAR} and del_flag='0')))
             </if>
         </where>
         ) t

ygtx-gxt/src/main/resources/mapper/gxt/GxtRepairOrderMapper.xml

@@ -206,11 +206,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 ${params.businessDataScope}
             </if>
             <!-- 限制待下发工单只能创建人本部门查看 -->
-            <if test="createBy != null and createBy != ''">
+            <if test="params.currentUser != null and params.currentUser != ''">
                 and ((t.work_order_status != 'to_issue' and t.work_order_status != 'accept_return') or t.create_by in
                     (select user_name from sys_user t1
                      left join sys_dept t2 on t1.dept_id = t2.dept_id
-                     where t2.dept_id = (select dept_id from sys_user where user_name = #{createBy,jdbcType=VARCHAR} and del_flag='0')))
+                     where t2.dept_id = (select dept_id from sys_user where user_name = #{params.currentUser,jdbcType=VARCHAR} and del_flag='0')))
             </if>
         </where>
         order by create_time desc

ygtx-gxt/src/main/resources/mapper/gxt/GxtWorkOrderMapper.xml

@@ -165,11 +165,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 ${params.businessDataScope}
             </if>
             <!-- 限制待下发工单只能创建人本部门查看 -->
-            <if test="createBy != null and createBy != ''">
+            <if test="params.currentUser != null and params.currentUser != ''">
                 and ((t.work_order_status != 'to_issue' and t.work_order_status != 'accept_return') or t.create_by in
                 (select user_name from sys_user t1
                 left join sys_dept t2 on t1.dept_id = t2.dept_id
-                where t2.dept_id = (select dept_id from sys_user where user_name = #{createBy,jdbcType=VARCHAR} and del_flag='0')))
+                where t2.dept_id = (select dept_id from sys_user where user_name = #{params.currentUser,jdbcType=VARCHAR} and del_flag='0')))
             </if>
         </where>
         order by create_time desc