0618

src/main/java/cn/ezhizao/project/business/technologicalProcessDetailDrawing/controller/BizTechnologicalProcessDetailDrawingController.java

@@ -373,14 +373,14 @@ public class BizTechnologicalProcessDetailDrawingController extends BaseControll
                     message.setToUserName(v.getUserName());
                     BizProcess bizProcess = processList.stream().filter(p -> p.getProcessCode().equals(d.getProcessCode())).findFirst().orElse(null);
                     if(d.getAbandoned() == 1){
-                        String mes = d.getProduct().getDescription() + "产品，工艺版本" + d.getProductVersion()  + bizProcess.getProcessAlias() + "工序" + d.getDrawingName() + "图纸名，图纸已作废，请注意审批。";
+                        String mes = d.getProduct().getDescription() + "产品，工艺版本" + d.getProductVersion()+"，"   + bizProcess.getProcessAlias() + "工序，" + d.getDrawingName() + "图纸名，图纸已作废，请注意审批。";
                         message.setMessage(mes);
                     }else{
                         if(d.getPattern().trim().equals("替换产品")){
-                            String mes = d.getProduct().getDescription() + "产品，工艺版本" + d.getProductVersion()  + bizProcess.getProcessAlias() + "工序" + d.getDrawingName() + "图纸名，图纸已变更，请注意审批。";
+                            String mes = d.getProduct().getDescription() + "产品，工艺版本" + d.getProductVersion()+"，"   + bizProcess.getProcessAlias() + "工序，" + d.getDrawingName() + "图纸名，图纸已变更，请注意审批。";
                             message.setMessage(mes);
                         }else{
-                            String mes = d.getProduct().getDescription() + "产品，工艺版本" + d.getProductVersion()  + bizProcess.getProcessAlias() + "工序" + d.getDrawingName() + "图纸名，图纸已上传，请注意审批。";
+                            String mes = d.getProduct().getDescription() + "产品，工艺版本" + d.getProductVersion()+"，"   + bizProcess.getProcessAlias() + "工序，" + d.getDrawingName() + "图纸名，图纸已上传，请注意审批。";
                             message.setMessage(mes);
                         }
                     }
@@ -418,7 +418,7 @@ public class BizTechnologicalProcessDetailDrawingController extends BaseControll
                     message.setToUserId(v.getUserId());
                     message.setToUserName(v.getUserName());
                     BizProcess bizProcess = processList.stream().filter(p -> p.getProcessCode().equals(d.getProcessCode())).findFirst().orElse(null);
-                    String mes = d.getProduct().getDescription() + "产品，工艺版本" + d.getProductVersion()  + bizProcess.getProcessAlias().trim() + "工序" + d.getDrawingName() + "图纸名，图纸已变化，请注意审批。";
+                    String mes = d.getProduct().getDescription() + "产品，工艺版本" + d.getProductVersion()+"，"   + bizProcess.getProcessAlias().trim() + "工序，" + d.getDrawingName() + "图纸名，图纸已变化，请注意审批。";
 //                    message.setMessage("您有图纸待批准，请前往【工艺管理】下【等待批准图纸】菜单进行操作。");
                     message.setMessage(mes);
                     message.setMessageDate(new Date());

src/main/java/cn/ezhizao/project/business/technologicalProcessDetailDrawing/service/impl/BizTechnologicalProcessDetailDrawingServiceImpl.java

@@ -621,6 +621,7 @@ public class BizTechnologicalProcessDetailDrawingServiceImpl extends ServiceImpl
         roles.forEach(l -> {
             SysUser conditions = new SysUser();
             conditions.setRoleId(l.getRoleId());
+            conditions.setTenantId(Long.parseLong(request.getHeader("tenantId")));
             List<SysUser> items = sysUserMapper.selectAllocatedList(conditions);
             items.forEach(v -> {
                 BizMessage message = new BizMessage();
@@ -631,7 +632,7 @@ public class BizTechnologicalProcessDetailDrawingServiceImpl extends ServiceImpl
                 message.setToUserId(v.getUserId());
                 message.setToUserName(v.getUserName());
 //                message.setMessage("您有图纸待批准，请前往【工艺管理】下【等待批准图纸】菜单进行操作。");
-                String mes = drawing.getProduct().getDescription() + "产品，工艺版本" + drawing.getProductVersion()  + process.getProcessAlias().trim() + "工序" + drawing.getDrawingName() + "图纸名，图纸已变化，请注意审批。";
+                String mes = drawing.getProduct().getDescription() + "产品，工艺版本" + drawing.getProductVersion()+","  + process.getProcessAlias().trim() + "工序," + drawing.getDrawingName() + "图纸名，图纸已变化，请注意审批。";
                 message.setMessage(mes);
                 message.setMessageDate(new Date());
                 messages.add(message);
@@ -656,14 +657,14 @@ public class BizTechnologicalProcessDetailDrawingServiceImpl extends ServiceImpl
                 message.setToUserId(v.getUserId());
                 message.setToUserName(v.getUserName());
                 if(drawing.getAbandoned() == 1){
-                    String mes = drawing.getProduct().getDescription() + "产品，工艺版本" + drawing.getProductVersion()  + process.getProcessAlias().trim() + "工序" + drawing.getDrawingName() + "图纸名，图纸已作废，请注意审批。";
+                    String mes = drawing.getProduct().getDescription() + "产品，工艺版本" + drawing.getProductVersion()+"，"   + process.getProcessAlias().trim() + "工序，" + drawing.getDrawingName() + "图纸名，图纸已作废，请注意审批。";
                     message.setMessage(mes);
                 }else{
                     if(drawing.getPattern().trim().equals("替换产品")){
-                        String mes = drawing.getProduct().getDescription() + "产品，工艺版本" + drawing.getProductVersion()  + process.getProcessAlias().trim() + "工序" + drawing.getDrawingName() + "图纸名，图纸已变更，请注意审批。";
+                        String mes = drawing.getProduct().getDescription() + "产品，工艺版本" + drawing.getProductVersion()+"，"   + process.getProcessAlias().trim() + "工序，" + drawing.getDrawingName() + "图纸名，图纸已变更，请注意审批。";
                         message.setMessage(mes);
                     }else{
-                        String mes = drawing.getProduct().getDescription() + "产品，工艺版本" + drawing.getProductVersion()  + process.getProcessAlias().trim() + "工序" + drawing.getDrawingName() + "图纸名，图纸已上传，请注意审批。";
+                        String mes = drawing.getProduct().getDescription() + "产品，工艺版本" + drawing.getProductVersion()+"，"   + process.getProcessAlias().trim() + "工序，" + drawing.getDrawingName() + "图纸名，图纸已上传，请注意审批。";
                         message.setMessage(mes);
                     }
                 }

src/main/resources/mybatis/system/SysUserMapper.xml

@@ -336,7 +336,7 @@
 		${params.dataScope}
 	</select>
 	<select id="getAllFormman" resultType="SysUser">
-		select t1.* from sys_user t1 left join sys_dept_user t2 on t1.user_id = t2.user_id
+		select distinct t1.* from sys_user t1 left join sys_dept_user t2 on t1.user_id = t2.user_id
 		where t1.del_flag = '0' and t2.deleted = 0 and t2.is_formman = 1
 		<if test="tenantId != null and tenantId != 0"> AND t1.tenant_id = #{tenantId}</if>
 	</select>