feat:人脸审批管理权限控制

pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysUserFaceController.java

@@ -11,6 +11,7 @@ import com.bsd.pjcloud.admin.api.entity.SysUserFaceEntity;
 import com.bsd.pjcloud.admin.api.vo.SysUserFaceVo;
 import com.bsd.pjcloud.admin.service.SysUserFaceService;
 import com.bsd.pjcloud.common.core.util.R;
+import com.bsd.pjcloud.common.data.datascope.DataScope;
 import com.bsd.pjcloud.common.idempotent.annotation.Idempotent;
 import com.bsd.pjcloud.common.log.annotation.SysLog;
 import com.bsd.pjcloud.common.security.annotation.Inner;
@@ -140,7 +141,9 @@ public class SysUserFaceController {
     @PostMapping("/page-check-join")
     public R<Page<SysUserFaceVo>> appPageCheckJoin(@ParameterObject Page page, @RequestBody SysUserFaceDto dto) {
         dto.setIsFindCheckUser(true);
-        return R.ok(sysUserFaceService.pageJoin(page, dto));
+        DataScope dataScope = new DataScope();
+        dataScope.setScopeDeptName("userDeptId");
+        return R.ok(sysUserFaceService.scopePageList(page, dto, dataScope));
     }
 
     @Operation(summary = "通过id查询", description = "通过id查询")

pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserFaceServiceImpl.java

@@ -147,7 +147,32 @@ public class SysUserFaceServiceImpl extends ServiceImpl<SysUserFaceMapper, SysUs
 
     @Override
     public Page<SysUserFaceVo> scopePageList(Page page, SysUserFaceDto dto, DataScope dataScope) {
-        return baseMapper.scopePageList(page, dto, DataScope.of());
+        if (ObjectUtil.isNotEmpty(dto.getMerchantDeptIdOrGlobal())) {
+            List<SysDept> deptList = sysDeptService.listDescendant(dto.getMerchantDeptIdOrGlobal());
+            if (ObjectUtil.isNotEmpty(deptList)) {
+                List<Long> deptIds = deptList.stream().map(SysDept::getDeptId).toList();
+                dto.setDeptIds(deptIds);
+            }
+        }
+        Page<SysUserFaceVo> list = baseMapper.scopePageList(page, dto, dataScope);
+        // 审批流程
+        if (dto.getIsFindCheckUser()) {
+            List<String> processInstanceIds = list.getRecords().stream().map(SysUserFaceVo::getProcessId).filter(ObjectUtil::isNotEmpty).distinct().toList();
+            if (ObjectUtil.isNotEmpty(processInstanceIds)) {
+                List<TaskDto> taskList = flowUtil.queryProcessInstanceList(SecurityUtils.getUser().getId().toString(), processInstanceIds);
+                if (ObjectUtil.isNotEmpty(taskList)) {
+                    Map<String, TaskDto> taskMap = CollectionUtils.convertMap(taskList, TaskDto::getProcessInstanceId);
+                    CollectionUtils.convertList(list.getRecords(), v -> {
+                        TaskDto task = taskMap.get(v.getProcessId());
+                        if (ObjectUtil.isNotEmpty(task)) {
+                            v.setIsCheckUser(true);
+                        }
+                        return v;
+                    });
+                }
+            }
+        }
+        return list;
     }
 
     @Override

pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserTransactionServiceImpl.java

@@ -78,6 +78,8 @@ public class SysUserTransactionServiceImpl extends ServiceImpl<SysUserTransactio
         dto.setApplyUserId(applyUser.getId());
         if (ObjectUtil.notEqual(dto.getBizType(), UserTransactionEnum.INNER_TRANSFER.getType())) {
             dto.setIsWalletTransaction(YesNoEnum.YES.getCode());
+        } else {
+            dto.setIsWalletTransaction(YesNoEnum.NO.getCode());
         }
         // 查询调动用户
         SysUser userDetail = sysUserService.getById(dto.getUserId());

pjcloud-upms/pjcloud-upms-biz/src/main/resources/mapper/SysUserFaceMapper.xml

@@ -37,7 +37,8 @@
         <include refid="selectA"/>
         u.name as username,
         u.avatar as userAvatar,
-        u.phone as userMobile
+        u.phone as userMobile,
+        u.dept_id as userDeptId
         from sys_user_face a
         left join sys_user u on u.user_id = a.user_id
         <where>