system用户调用调整

yudao-module-pms/yudao-module-pms-biz/pom.xml

@@ -29,8 +29,8 @@
         </dependency>
         <dependency>
             <groupId>cn.iocoder.boot</groupId>
-            <artifactId>yudao-module-system-biz</artifactId>
-            <version>2.4.1-jdk8-SNAPSHOT</version>
+            <artifactId>yudao-module-system-api</artifactId>
+            <version>2.4.2-jdk8-SNAPSHOT</version>
         </dependency>
         <!-- Web 相关 -->
         <dependency>

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/failure/IotFailureReportServiceImpl.java

@@ -20,6 +20,8 @@ import cn.iocoder.yudao.module.supplier.enums.common.SupplierAuditStatusEnum;
 import cn.iocoder.yudao.module.system.api.dingtalk.DingtalkSendApi;
 import cn.iocoder.yudao.module.system.api.notify.NotifyMessageSendApi;
 import cn.iocoder.yudao.module.system.api.notify.dto.NotifySendSingleToUserReqDTO;
+import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
 import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
 import cn.iocoder.yudao.module.system.dal.mysql.user.AdminUserMapper;
@@ -60,7 +62,7 @@ public class IotFailureReportServiceImpl implements IotFailureReportService {
     @Resource
     private DeptService deptService;
     @Resource
-    private AdminUserMapper adminUserMapper;
+    private AdminUserApi adminUserApi;
     @Resource
     private DingtalkSendApi dingtalkSendApi;
     @Resource
@@ -117,7 +119,7 @@ public class IotFailureReportServiceImpl implements IotFailureReportService {
             //todo 发送站内信及钉钉
             Long loginUserDeptId = SecurityFrameworkUtils.getLoginUserDeptId();
             DeptDO dept = deptService.getDept(loginUserDeptId);
-            List<AdminUserDO> users = adminUserMapper.selectListByDept(dept.getParentId());
+            List<AdminUserRespDTO> users = adminUserApi.getUserListByDept(dept.getParentId());
             String templateCode = "failure-report"; // 站内信模版，记得在【站内信管理】中配置噢
             Map<String, Object> templateParams = new HashMap<>();
             templateParams.put("name", iotFailureReport.getDeviceName());

yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApi.java

@@ -31,6 +31,7 @@ public interface AdminUserApi {
      */
     List<AdminUserRespDTO> getUserListBySubordinate(Long id);
     List<AdminUserRespDTO> getUserListByDeptId(Long id);
+    List<AdminUserRespDTO> getUserListByDept(Long id);
 
     /**
      * 通过用户 ID 查询用户们

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApiImpl.java

@@ -30,6 +30,7 @@ public class AdminUserApiImpl implements AdminUserApi {
     @Resource
     private DeptService deptService;
 
+
     @Override
     @DataPermission(enable = false)
     public AdminUserRespDTO getUser(Long id) {
@@ -77,6 +78,11 @@ public class AdminUserApiImpl implements AdminUserApi {
         return BeanUtils.toBean(users, AdminUserRespDTO.class);
     }
 
+    @Override
+    public List<AdminUserRespDTO> getUserListByDept(Long id) {
+        return BeanUtils.toBean(userService.selectListByDept(id), AdminUserRespDTO.class);
+    }
+
     @Override
     public List<AdminUserRespDTO> getUserList(Collection<Long> ids) {
         return DataPermissionUtils.executeIgnore(() -> { // 禁用数据权限。原因是，一般基于指定 id 的 API 查询，都是数据拼接为主

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserService.java

@@ -216,4 +216,5 @@ public interface AdminUserService {
      */
     boolean isPasswordMatch(String rawPassword, String encodedPassword);
 
+    List<AdminUserDO> selectListByDept(Long deptId);
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java

@@ -518,6 +518,11 @@ public class AdminUserServiceImpl implements AdminUserService {
         return passwordEncoder.matches(rawPassword, encodedPassword);
     }
 
+    @Override
+    public List<AdminUserDO> selectListByDept(Long deptId) {
+        return userMapper.selectListByDept(deptId);
+    }
+
     /**
      * 对密码进行加密
      *