线上版本-bug-20201103

stmms-ms-admin/src/main/java/cn/com/qmth/stmms/ms/admin/api/QualityAnalyseController.java

@@ -71,7 +71,7 @@ public class QualityAnalyseController {
             StringBuffer sql = new StringBuffer();
             sql.append("  SELECT                                                        ");
             sql.append("      mu.id markerId,                                           ");
-            sql.append("      mu.name markerName,                                       ");
+            sql.append("      mu.login_name markerName,                                       ");
             sql.append("      SUM(IF(mt.result = '" + l.getCode() + "', 1, 0)) levelCount,  ");
             sql.append("      COUNT(1) total                                            ");
             sql.append("  FROM                                                          ");

stmms-ms-admin/src/main/java/cn/com/qmth/stmms/ms/admin/service/OrganizationService.java

@@ -52,10 +52,21 @@ public class OrganizationService {
         if (markUser == null) {
             throw new RuntimeException("机构信息有误");
         }
-        Organization organization1 = organizationRepo.findByName(organization.getName());
+        Organization organization1 = organizationRepo.findByName(markUser.getName());
         if (organization1 != null) {
             throw new RuntimeException("机构名称已存在");
         }
+
+        long distinctNameCount = organization.getMarkUsers().stream().map(m->m.getName()).distinct().count();
+        if(distinctNameCount == 1){
+            throw new RuntimeException("机构名称、项目经理名称不能相同");
+        }
+
+        long distinctLoginNameCount = organization.getMarkUsers().stream().map(m->m.getLoginName()).distinct().count();
+        if(distinctLoginNameCount == 1){
+            throw new RuntimeException("机构账号、项目经理账号不能相同");
+        }
+
         //机构名称
         organization.setName(markUser.getName());
         //默认启用

stmms-ms-collect/src/main/java/cn/com/qmth/stmms/ms/collect/api/CollectApi.java

@@ -156,7 +156,7 @@ public class CollectApi {
 //            activeWork = workRepo.findByActiveTrue();
         activeWork = workRepo.findByActiveTrueAndOrganizationId(markUser.getOrganizationId());
         if (Objects.isNull(activeWork)) {
-            throw new Exception("没有work");
+            throw new Exception("未开启工作任务");
         }
 
         //采集用户工作与当前工作不匹配

stmms-ms-marking/src/main/java/cn/com/qmth/stmms/ms/marking/api/PaperApi.java

@@ -403,7 +403,7 @@ public class PaperApi {
                 } else if (Objects.equals(type, "task")) {
                     List<MarkTask> markTasks = markTaskRepo.findByWorkIdAndSecretNumber(workId, number);
                     if (markTasks == null || markTasks.size() == 0) {
-                        predicates.add(builder.equal(root.get("id"), null));
+                        predicates.add(builder.isNull(root.get("id")));
                     } else {
                         predicates.add(builder.equal(root.get("id"), markTasks.get(0).getPaper().getId()));
                     }