用户组判断修改；

src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustSampleItemServiceImpl.java

@@ -174,9 +174,10 @@ public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleI
         RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择要提交的检测项目");
         List<EntrustSampleItem> list = super.list(Condition.create().in("id",ids).eq("status",EntrustSampleItemStatusEnum.TEST));
         RestAssert.fail(list.size()!=ids.length,"请选择待检测的检测项目");
-        for (EntrustSampleItem sampleItem:list) {
-            RestAssert.fail(StringUtils.isBlank(sampleItem.getTestValue()),"检测项目名称："+sampleItem.getName()+"未填写检测值，请确认！");
-        }
+        // 不再对检测值进行判断
+        // for (EntrustSampleItem sampleItem:list) {
+        //     RestAssert.fail(StringUtils.isBlank(sampleItem.getTestValue()),"检测项目名称："+sampleItem.getName()+"未填写检测值，请确认！");
+        // }
 
         EntrustSampleItem item = new EntrustSampleItem();
 

src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/QualificationServiceImpl.java

@@ -5,6 +5,7 @@ import com.patzn.cloud.service.hmhj.entity.Qualification;
 import com.patzn.cloud.service.lims.hmhj.mapper.QualificationMapper;
 import com.patzn.cloud.service.lims.hmhj.service.IQualificationService;
 import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
@@ -13,7 +14,7 @@ import com.baomidou.mybatisplus.plugins.Page;
 import java.util.List;
 
 /**
- *  服务实现类
+ * 服务实现类
  *
  * @author wwd
  * @since 2021-02-03
@@ -23,8 +24,22 @@ public class QualificationServiceImpl extends BaseServiceImpl<QualificationMappe
 
     @Override
     public Page<Qualification> page(Page<Qualification> page, Qualification qualification) {
+        String name = qualification.getName();
+        String accordName = qualification.getAccordName();
+        String groupName = qualification.getGroupName();
+        qualification.setName(null);
+        qualification.setAccordName(null);
+        qualification.setGroupName(null);
         Wrapper wrapper = new EntityWrapper<>(qualification);
-
+        if (StringUtils.isNotBlank(name)) {
+            wrapper.like("name", name);
+        }
+        if (StringUtils.isNotBlank(groupName)) {
+            wrapper.like("group_name", groupName);
+        }
+        if (StringUtils.isNotBlank(accordName)) {
+            wrapper.like("accord_name", accordName);
+        }
         return this.page(page, wrapper);
     }
 

src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/UserInfoServiceImpl.java

@@ -18,19 +18,30 @@ import java.util.stream.Collectors;
 @Service
 public class UserInfoServiceImpl {
 
+    private static final List<LmsUserGroup> OTHER_GROUP_LIST = new ArrayList<>();
+    private static final List<String> OTHER_GROUP_NAME_LIST = new ArrayList<>();
+
+    static {
+        OTHER_GROUP_LIST.add(new LmsUserGroup().setName("OTHERS"));
+        OTHER_GROUP_NAME_LIST.add(OTHER_GROUP_LIST.get(0).getName());
+    }
+
     @Autowired
     private LmsUserGroupClient lmsUserGroupClient;
 
     public List<LmsUserGroup> getGroupList(Long userId) {
         if (null == userId) {
-            return new ArrayList<>();
+            return OTHER_GROUP_LIST;
         }
         // 获取用户组
-        List<LmsUserGroup> userGroups = lmsUserGroupClient.getByUserId(userId).getData();
-        return CollectionUtils.isEmpty(userGroups) ? new ArrayList<>() : userGroups;
+        return lmsUserGroupClient.getByUserId(userId).getData();
     }
 
     public List<String> getGroupNameList(Long userId) {
+        List<LmsUserGroup> userGroups = getGroupList(userId);
+        if (CollectionUtils.isEmpty(userGroups)) {
+            return OTHER_GROUP_NAME_LIST;
+        }
         return getGroupList(userId).stream().map(t -> t.getName()).filter(t -> StringUtils.isNotBlank(t)).collect(Collectors.toList());
     }
 
@@ -39,6 +50,10 @@ public class UserInfoServiceImpl {
     }
 
     public String getCurGroupNames() {
-        return StringUtils.join(getCurGroupNameList(), "-");
+        List<String> curGroupNameList = getCurGroupNameList();
+        if (CollectionUtils.isEmpty(curGroupNameList)) {
+            return OTHER_GROUP_NAME_LIST.get(0);
+        }
+        return StringUtils.join(curGroupNameList, "-");
     }
 }