Merge remote-tracking branch 'origin/master'

operation_manager/src/main/java/com/huaxu/order/controller/WorkOrderManageController.java

@@ -84,6 +84,8 @@ public class WorkOrderManageController {
     public AjaxMessage<Integer> insertSelective(@ApiParam(value = "工单信息", required = true) @RequestBody WorkOrderManage workOrderManage) {
         LoginUser currentUser = UserUtil.getCurrentUser();
         workOrderManage.setTenantId(currentUser.getTenantId());
+        workOrderManage.setCompanyOrgId(currentUser.getCompanyId().toString());
+        workOrderManage.setDepartmentOrgId(currentUser.getDepartmentId().toString());
         workOrderManage.setCreateBy(currentUser.getId().toString());
         workOrderManage.setDateCreate(workOrderManage.getDateCreate()==null?new Date():workOrderManage.getDateCreate());
         workOrderManage.setOrderStatus(0);
@@ -365,7 +367,7 @@ public class WorkOrderManageController {
         workOrderManageDto.setTaskNo(taskNo);
         workOrderManageDto.setOrderTypeId(orderTypeId);
         if(loginUser.getId() != null) {
-            workOrderManageDto.setCurrentUsers(String.format("%s,", loginUser.getId()));
+            workOrderManageDto.setCurrentUsers(String.format("%s", loginUser.getId()));
         }
         IPage<WorkOrderManageDto> iPage = new Page<>(pageNum, pageSize);
         iPage = workOrderManageService.selectPage(iPage, workOrderManageDto);
@@ -622,7 +624,7 @@ public class WorkOrderManageController {
         String currentUsers = null;
         LoginUser loginUser = UserUtil.getCurrentUser();
         if(loginUser.getId() != null) {
-            currentUsers = String.format("%s,", loginUser.getId());
+            currentUsers = String.format("%s", loginUser.getId());
         }
         Map<String,Object> map = new HashMap<String,Object>();
         map.put("id",id);

operation_manager/src/main/java/com/huaxu/task/controller/PlanManageController.java

@@ -144,7 +144,7 @@ public class PlanManageController {
         }
         planManageDto.setTaskType(taskType);
         if(loginUser.getId() != null) {
-            planManageDto.setCurrentUsers(String.format("%s,", loginUser.getId()));
+            planManageDto.setCurrentUsers(String.format("%s", loginUser.getId()));
         }
         IPage<PlanManageDto> iPage = new Page<>(pageNum, pageSize);
         iPage = planManageService.selectPage(iPage, planManageDto);
@@ -160,7 +160,7 @@ public class PlanManageController {
         String currentUsers = null;
         LoginUser loginUser = UserUtil.getCurrentUser();
         if(loginUser.getId() != null) {
-            currentUsers = String.format("%s,", loginUser.getId());
+            currentUsers = String.format("%s", loginUser.getId());
         }
         Map<String,Object> map = new HashMap<String,Object>();
         map.put("id",id);

operation_manager/src/main/resources/mapper/order/WorkOrderManageMapper.xml

@@ -598,7 +598,7 @@
         and t1.event_type = #{order.eventType,jdbcType=INTEGER}
       </if>
       <if test="order.currentUsers != null">
-        and  INSTR(t1.current_users,#{order.currentUsers})
+        and FIND_IN_SET(#{order.currentUsers,jdbcType=VARCHAR},t1.current_users)
       </if>
       <if test="order.startDate != null and order.endDate != null">
         and t1.date_create &gt;= date_format(#{order.startDate,jdbcType=VARCHAR},'%Y-%c-%d')
@@ -643,6 +643,6 @@
   <!--待处理权限-->
   <select id="selectPendingPower" resultType="java.lang.Integer" parameterType="map">
     select count(1) from sc_work_order_manage
-    where id = #{id,jdbcType=INTEGER} and INSTR(current_users,#{currentUsers,jdbcType=VARCHAR})
+    where id = #{id,jdbcType=INTEGER} and FIND_IN_SET(#{currentUsers,jdbcType=VARCHAR},current_users)
   </select>
 </mapper>

operation_manager/src/main/resources/mapper/task/PlanManageMapper.xml

@@ -438,7 +438,7 @@
         and t1.task_type = #{plan.taskType,jdbcType=INTEGER}
       </if>
       <if test="plan.currentUsers != null">
-        and  INSTR(t1.current_users,#{plan.currentUsers})
+        and FIND_IN_SET(#{plan.currentUsers,jdbcType=VARCHAR},t1.current_users)
       </if>
       <if test="plan.startDate != null and plan.endDate != null">
         and t1.date_create &gt;= date_format(#{plan.startDate,jdbcType=VARCHAR},'%Y-%c-%d')
@@ -451,7 +451,7 @@
   <!--待处理权限-->
   <select id="selectPendingPower" resultType="java.lang.Integer" parameterType="map">
     select count(1) from sc_plan_manage
-    where id = #{id,jdbcType=INTEGER} and INSTR(current_users,#{currentUsers,jdbcType=VARCHAR})
+    where id = #{id,jdbcType=INTEGER} and FIND_IN_SET(#{currentUsers,jdbcType=VARCHAR},current_users)
   </select>
 
   <!--查询流程节点-->