Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

liukangdong

2024-05-15 959edec9fe35807d6b1b794cce42e9665d50d3a8

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java

@@ -12,6 +12,7 @@
import com.doumee.dao.admin.request.LaborMemberDTO;
import com.doumee.dao.admin.request.MemberQuery;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.MemberRole;
import com.doumee.service.business.MemberService;
import com.doumee.service.business.ext.ERPSyncService;
import com.doumee.service.business.impl.hksync.fhk.HkSyncOrgUserFromHKServiceImpl;
@@ -88,8 +89,8 @@
    @ApiOperation("员工权限下发")
    @GetMapping("/roleAuth/{id}")
    @CloudRequiredPermission("business:empower:create")
    public ApiResponse roleAuthById(@PathVariable Integer id) {
        memberService.roleAuthById(id);
    public ApiResponse roleAuthById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        memberService.roleAuthById(id,this.getLoginUser(token));
        return ApiResponse.success(null);
    }

@@ -97,9 +98,17 @@
    @ApiOperation("同步人脸信息")
    @PostMapping("/updateFace")
    public ApiResponse updateFace(@RequestBody Member member,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        member.setLoginUserInfo(this.getLoginUser(token));
        memberService.updateFace(member);
        return ApiResponse.success(null);
    }
    @ApiOperation("同步人脸信息")
    @PostMapping("/batchRoleAuth")
    public ApiResponse batchRoleAuth(@RequestBody Member memberRole, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        memberRole.setLoginUserInfo(this.getLoginUser(token));
        memberService.batchRoleAuth(memberRole);
        return ApiResponse.success(null);
    }
    @ApiOperation("强制删除安防平台人员信息")
    @PostMapping("/delHkForce")
    public ApiResponse delHkForce(@RequestBody Member member,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){