添加部分提示消息；

src/main/java/com/patzn/cloud/service/lims/hmhj/service/IEntrustSampleItemService.java

@@ -106,4 +106,5 @@ public interface IEntrustSampleItemService extends IBaseService<EntrustSampleIte
 
     boolean revokeDeletedItems(Long[] sampleIds);
 
+    List<EntrustSampleItem> getListByEntrustId(Long entrustId);
 }

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

@@ -1318,6 +1318,14 @@ public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleI
         return baseMapper.updateForRevokeDeletedItems(sampleIds);
     }
 
+    @Override
+    public List<EntrustSampleItem> getListByEntrustId(Long entrustId) {
+        if (null == entrustId) {
+            return null;
+        }
+        return list(Condition.create().exists("select 1 from entrust_sample s where s.deleted = 0 and s.id = entrust_sample_item.entrust_sample_id and s.entrust_id = " + entrustId));
+    }
+
     /**
      * 处理 原铝等标准为
      */

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

@@ -11,7 +11,10 @@ import com.patzn.cloud.feign.lims.base.client.LmsUserGroupClient;
 import com.patzn.cloud.service.base.entity.SysOrg;
 import com.patzn.cloud.service.base.entity.SysUser;
 import com.patzn.cloud.service.hmhj.entity.Entrust;
+import com.patzn.cloud.service.hmhj.enums.MessageUserEnum;
 import com.patzn.cloud.service.lims.base.entity.LmsUserGroup;
+import com.patzn.cloud.service.lims.base.vo.GroupUserVO;
+import com.patzn.cloud.service.lims.common.consts.Symbol;
 import com.patzn.cloud.service.lims.hmhj.service.IEntrustService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,6 +23,7 @@ import org.springframework.stereotype.Service;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 @Service
 public class UserInfoServiceImpl {
@@ -75,6 +79,24 @@ public class UserInfoServiceImpl {
         return StringUtils.join(curGroupNameList, "-");
     }
 
+    public List<Long> getGroupUserIds(Long userId) {
+        // 为空默认获取当前用户所有组
+        Account account = LoginHelper.getAccount();
+        if (null == userId) {
+            userId = account.getUserId();
+        }
+        List<LmsUserGroup> userGroups = getGroupList(userId);
+        if (CollectionUtils.isEmpty(userGroups)) {
+            return null;
+        }
+        List<String> groupNames = userGroups.stream().map(LmsUserGroup::getName).collect(Collectors.toList());
+        List<GroupUserVO> groupUserList = lmsUserGroupClient.getGroupUserIdsList(account.getCompanyId()).serviceData();
+        String userIdStr = groupUserList.stream().filter(t ->
+                groupNames.contains(t.getGroupName()) && StringUtils.isNotBlank(t.getUserIds())
+        ).map(GroupUserVO::getUserIds).collect(Collectors.joining(Symbol.COMMA));
+        return Stream.of(userIdStr.split(Symbol.COMMA)).map(Long::valueOf).distinct().collect(Collectors.toList());
+    }
+
     public boolean isGroupLeader(Long entrustId, Account account) {
         if (null == entrustId) {
             return false;
@@ -117,4 +139,16 @@ public class UserInfoServiceImpl {
         return getUserById(LoginHelper.getAccount().getUserId());
     }
 
+    public List<Long> getUserIds(MessageUserEnum messageUserEnum, Long someoneId) {
+        List<Long> userIdList = new ArrayList<>();
+        if (MessageUserEnum.CURRENT == messageUserEnum) {
+            userIdList.add(LoginHelper.getAccount().getUserId());
+        } else if (MessageUserEnum.SOMEONE == messageUserEnum) {
+            userIdList.add(someoneId);
+        } else {
+            userIdList.addAll(getGroupUserIds(null));
+        }
+        return userIdList;
+    }
+
 }

src/test/java/resources/db_sql/hmhj/v150/20200810新增业务数据字段.sql

+/** created by meazty on 2021/8/10 11:11 **/
+/** created by meazty on 2021/8/10 11:11 **/
+ALTER TABLE "public"."business_data"
+    ADD COLUMN "data_name" varchar(128) COLLATE "pg_catalog"."default";
+
+COMMENT ON COLUMN "public"."business_data"."data_name" IS '数据名称';