Merge remote-tracking branch 'origin/master'

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

@@ -83,29 +83,32 @@ public class WorkOrderManageController {
     public AjaxMessage<Integer> insertSelective(@ApiParam(value = "工单信息", required = true) @RequestBody WorkOrderManage workOrderManage) {
         LoginUser currentUser = UserUtil.getCurrentUser();
         workOrderManage.setTenantId(currentUser.getTenantId());
-        workOrderManage.setCreateBy(currentUser.getUsername());
+        workOrderManage.setCreateBy(currentUser.getId().toString());
         workOrderManage.setDateCreate(workOrderManage.getDateCreate()==null?new Date():workOrderManage.getDateCreate());
         workOrderManage.setOrderStatus(0);
         workOrderManage.setTaskNo(DatesUtil.formatDate(new Date(),"yyyyMMddHHmmss")+String.valueOf((int) (Math.random()*(9999-1000)+1000)));
         workOrderManageService.insertSelective(workOrderManage);
         int result =workOrderManage.getId();//返回新增数据的id
-
         //发消息
-        Message message=new Message();
-        message.setStatus(1);
-        message.setCreateBy(currentUser.getUsername());
-        message.setTenantId(currentUser.getTenantId());
-        message.setMessageContent(workOrderManage.getTaskDesc());
-        message.setMessageId(UUID.randomUUID().toString());
-        message.setMessageType(3);
-        message.setMessageTemplateId(3);
-        message.setChannel(0);
-        message.setUrl(String.valueOf(result));
-        //获取需要发消息的用户
-        List<Long> users=userCenterClient.findUserIdsForOrg();
-        for(Long user : users){
-            message.setUserId(user.intValue());
-            messageSendUtil.send(message);
+        try {
+            Message message=new Message();
+            message.setStatus(1);
+            message.setCreateBy(currentUser.getId().toString());
+            message.setTenantId(currentUser.getTenantId());
+            message.setMessageContent(workOrderManage.getTaskDesc());
+            message.setMessageId(UUID.randomUUID().toString());
+            message.setMessageType(3);
+            message.setMessageTemplateId(3);
+            message.setChannel(0);
+            message.setUrl(String.valueOf(result));
+            //获取需要发消息的用户
+            List<Long> users=userCenterClient.findUserIdsForOrg();
+            for(Long user : users){
+                message.setUserId(user.intValue());
+                messageSendUtil.send(message);
+            }
+        }catch(Exception e){
+            e.printStackTrace();
         }
 
         return new AjaxMessage<>(ResultStatus.OK, result);
@@ -159,7 +162,7 @@ public class WorkOrderManageController {
         workFlowLog.setFlowId(flowId);
         workFlowLog.setFlowType(flowType);
         workFlowLog.setFlowResult(flowResult);
-        workFlowLog.setCreateBy(currentUser.getUsername());
+        workFlowLog.setCreateBy(currentUser.getId().toString());
         workFlowLog.setDateCreate(new Date());
         workFlowLog.setHandleUserId(currentUser.getId()!=null?currentUser.getId().toString():null);
         workFlowLog.setHandleUserName(currentUser.getUsername());
@@ -186,7 +189,7 @@ public class WorkOrderManageController {
                 plan.setCurrentTaskId(handleResult.size()>0?handleResult.get(0).getCurrentTaskId():null);
                 plan.setCurrentUsers(handleResult.size()>0?handleResult.get(0).getCurrentTaskUsers():null);
                 plan.setCurrentTaskName(handleResult.size()>0?handleResult.get(0).getCurrentTaskName():null);
-                plan.setUpdateBy(currentUser.getUsername());
+                plan.setUpdateBy(currentUser.getId().toString());
                 plan.setDateUpdate(new Date());
                 if(handleResult.size()==0||handleResult==null) {
                     plan.setPlanStatus(2);
@@ -202,7 +205,7 @@ public class WorkOrderManageController {
             if(actionId==4||actionId==5){
                 WorkOrderManage workOrderManage=new WorkOrderManage();
                 workOrderManage.setTenantId(currentUser.getTenantId());
-                workOrderManage.setCreateBy(currentUser.getUsername());
+                workOrderManage.setCreateBy(currentUser.getId().toString());
                 workOrderManage.setDateCreate(new Date());
                 workOrderManage.setOrderStatus(0);
                 workOrderManage.setTaskNo(DatesUtil.formatDate(new Date(),"yyyyMMddHHmmss")+String.valueOf((int) (Math.random()*(9999-1000)+1000)));
@@ -233,7 +236,7 @@ public class WorkOrderManageController {
                 order.setCurrentTaskId(handleResult.size()>0?handleResult.get(0).getCurrentTaskId():null);
                 order.setCurrentUsers(handleResult.size()>0?handleResult.get(0).getCurrentTaskUsers():null);
                 order.setCurrentTaskName(handleResult.size()>0?handleResult.get(0).getCurrentTaskName():null);
-                order.setUpdateBy(currentUser.getUsername());
+                order.setUpdateBy(currentUser.getId().toString());
                 order.setDateUpdate(new Date());
                 if(handleResult.size()==0||handleResult==null) {
                     order.setOrderStatus(2);
@@ -278,11 +281,11 @@ public class WorkOrderManageController {
 
         //插入或更新详情
         if(detailId==null) {
-            workFlowDetail.setCreateBy(currentUser.getUsername());
+            workFlowDetail.setCreateBy(currentUser.getId().toString());
             workFlowDetail.setDateCreate(new Date());
             workFlowDetailService.insertSelective(workFlowDetail);
         }else{
-            workFlowDetail.setUpdateBy(currentUser.getUsername());
+            workFlowDetail.setUpdateBy(currentUser.getId().toString());
             workFlowDetail.setDateUpdate(new Date());
             workFlowDetail.setId(detailId);
             workFlowDetailService.updateByPrimaryKeySelective(workFlowDetail);

user_center/src/main/resources/mapper/UserMapper.xml

@@ -219,14 +219,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM uims_user a
         <include refid="sysAreaJoins"/>
         where a.status=1
-        and (1=1
         <if test="compayId != null and compayId != ''">
-          or  a.COMPANY_ORG_ID = #{compayId}
-        </if>
-        <if test="deptId != null and deptId != ''">
-           or a.DEPT_ORG_ID = #{deptId}
+            and (
+               a.COMPANY_ORG_ID = #{compayId}
+                <if test="deptId != null and deptId != ''">
+                   or a.DEPT_ORG_ID = #{deptId}
+                </if>
+            )
         </if>
-        )
     </select>
 
     <select id="findUserIdsByPermissonOrg" resultType="java.lang.Integer">