管理员角色变更

tianhu-system/src/main/java/com/tianhu/system/companyAuth/controller/OwnAuthController.java

@@ -232,7 +232,7 @@ public class OwnAuthController extends BaseController {
         queryWrapper.eq(SysCompany::getScyName,scyName);
         //统一社会信用代码
         queryWrapper.eq(SysCompany::getScySocialCode,scySocialCode);
-        queryWrapper.ne(SysCompany::getScyStatus,"02");
+        queryWrapper.ne(SysCompany::getScyStatus,"99");
         List<SysCompany> list = sysCompanyService.findSysCompanys(queryWrapper);
         if (list.size()>0){
             return R.fail("当前公司已存在,请重新选择公司");
@@ -249,7 +249,7 @@ public class OwnAuthController extends BaseController {
         }
         //到期时间
         String scyEndTime = CommonUtil.objToString(map.get("scyEndTime"));
-        if(CommonUtil.isEmpty(scyEndTime)||"--".equals(scyStartTime)){
+        if(CommonUtil.isEmpty(scyEndTime)||"--".equals(scyEndTime)){
             return R.fail("营业期限不能为空");
         }
         //企业地址
@@ -299,7 +299,7 @@ public class OwnAuthController extends BaseController {
                 return R.fail("经办人身份证不能为空");
             }
             if(!RegularUtil.cardId(handlerCard)){
-                throw new Exception("法人证件号码格式错误!");
+                throw new Exception("经办人身份证格式错误!");
             }
         }
         //经办人手机号
@@ -717,7 +717,7 @@ public class OwnAuthController extends BaseController {
             }else{
                 duiName= scyLegal;
             }
-            if(!operator.equals(duiName)){
+            if(!number.equals(phoneNumber)){
                 Long operatorUserId = null;
                 operatorUser = userService.selectUserByUserName(number);
                 if (operatorUser == null) {
@@ -760,40 +760,40 @@ public class OwnAuthController extends BaseController {
             String tittle = "【企业认证】"+scyName+"CFCA工商四要素认证失败，请联系用户"+phoneNumber+"线下核实企业信息；";
             ownNoticeService.sendNotice(scyId,scyId,tittle,"00",null,"09","0","1",null, null, null);
         }
-
-
-        // 审批增加分组
-        Map<String, Object> flowableRes = flowableService.addFlowableGroup(scyId, company.getScyName());
-        if (!"200".equals(flowableRes.get("code"))) {
-            throw new Exception("审批数据新增失败!");
-        }
-        flowableRes = flowableService.addFlowableGroup(deptList.get(0).getAlternateNumber(), dept.getDeptName());
-        if (!"200".equals(flowableRes.get("code"))) {
-            throw new Exception("审批数据新增失败!");
-        }
-        // 经办人与登录用户是同一手机号
-        if (use.getUserName().equals(phoneNumber)) {
-            flowableRes = flowableService.addFlowableUser(String.valueOf(use.getUserId()), use.getNickName(), scyId);
-            if (!"200".equals(flowableRes.get("code"))) {
-                throw new Exception("审批数据新增失败!");
-            }
-        } else {
-            flowableRes = flowableService.addFlowableUser(String.valueOf(use.getUserId()), use.getNickName(), scyId);
-            if (!"200".equals(flowableRes.get("code"))) {
-                throw new Exception("审批数据新增失败!");
-            }
-            flowableRes = flowableService.addFlowableUser(String.valueOf(handlerUser.getUserId()), handlerUser.getNickName(), scyId);
-            if (!"200".equals(flowableRes.get("code"))) {
-                throw new Exception("审批数据新增失败!");
-            }
-        }
-        // 业务人员不存在
-        if (operatorUser != null) {
-            flowableRes = flowableService.addFlowableUser(String.valueOf(operatorUser.getUserId()), operatorUser.getNickName(), scyId);
-            if (!"200".equals(flowableRes.get("code"))) {
-                throw new Exception("审批数据新增失败!");
-            }
-        }
+//
+//
+//        // 审批增加分组
+//        Map<String, Object> flowableRes = flowableService.addFlowableGroup(scyId, company.getScyName());
+//        if (!"200".equals(flowableRes.get("code"))) {
+//            throw new Exception("审批数据新增失败!");
+//        }
+//        flowableRes = flowableService.addFlowableGroup(deptList.get(0).getAlternateNumber(), dept.getDeptName());
+//        if (!"200".equals(flowableRes.get("code"))) {
+//            throw new Exception("审批数据新增失败!");
+//        }
+//        // 经办人与登录用户是同一手机号
+//        if (use.getUserName().equals(phoneNumber)) {
+//            flowableRes = flowableService.addFlowableUser(String.valueOf(use.getUserId()), use.getNickName(), scyId);
+//            if (!"200".equals(flowableRes.get("code"))) {
+//                throw new Exception("审批数据新增失败!");
+//            }
+//        } else {
+//            flowableRes = flowableService.addFlowableUser(String.valueOf(use.getUserId()), use.getNickName(), scyId);
+//            if (!"200".equals(flowableRes.get("code"))) {
+//                throw new Exception("审批数据新增失败!");
+//            }
+//            flowableRes = flowableService.addFlowableUser(String.valueOf(handlerUser.getUserId()), handlerUser.getNickName(), scyId);
+//            if (!"200".equals(flowableRes.get("code"))) {
+//                throw new Exception("审批数据新增失败!");
+//            }
+//        }
+//        // 业务人员不存在
+//        if (operatorUser != null) {
+//            flowableRes = flowableService.addFlowableUser(String.valueOf(operatorUser.getUserId()), operatorUser.getNickName(), scyId);
+//            if (!"200".equals(flowableRes.get("code"))) {
+//                throw new Exception("审批数据新增失败!");
+//            }
+//        }
 
         return R.ok(company);
     }
@@ -1151,36 +1151,36 @@ public class OwnAuthController extends BaseController {
         sysCompany.setScyId(scyId);
         //正常状态
         sysCompany.setScyStatus("00");
-        JSONObject companyAccount =null;
-        //jks路径
-        String jksPath = configService.selectConfigByKey("jks_path");
-        //密码
-        String keyStorePassword = configService.selectConfigByKey("cfca_key_store_password");
-        //渠道
-        String channel = configService.selectConfigByKey("cfca_channel");
-        //platId
-        String platId = configService.selectConfigByKey("cfca_platId");
-        if(CommonUtil.isNotEmpty(handler)) {
-            try {
-                companyAccount = AxqCommonUtil.companyAccount(scyName, IDENTTYPECODE, scySocialCode, phoneNumber, scyPhone, AUTHENTICATIONMODE, handler, TYPECODE, handlerCard,new HttpConnector(jksPath,keyStorePassword,channel,platId));
-                }catch (Exception e) {
-                throw new Exception("开户失败!");
-                }
-        }else{
-            try {
-                companyAccount = AxqCommonUtil.companyAccount(scyName, IDENTTYPECODE, scySocialCode, phoneNumber, scyPhone, AUTHENTICATIONMODE, scyLegal, TYPECODE, scyLegalId,new HttpConnector(jksPath,keyStorePassword,channel,platId));
-            }catch (Exception e) {
-                throw new Exception("开户失败!");
-            }
-            }
-        System.out.print("开户结果==========>" + companyAccount);
-        //返回cfca用户id
-        if(companyAccount.getJSONObject("enterprise")!=null||CommonUtil.isNotEmpty(companyAccount.getJSONObject("enterprise").getString("userId"))){
-            String userId = companyAccount.getJSONObject("enterprise").getString("userId");
-            sysCompany.setScyCfcaUserId(userId);
-        }else{
-            throw new Exception("开户失败!");
-        }
+//        JSONObject companyAccount =null;
+//        //jks路径
+//        String jksPath = configService.selectConfigByKey("jks_path");
+//        //密码
+//        String keyStorePassword = configService.selectConfigByKey("cfca_key_store_password");
+//        //渠道
+//        String channel = configService.selectConfigByKey("cfca_channel");
+//        //platId
+//        String platId = configService.selectConfigByKey("cfca_platId");
+//        if(CommonUtil.isNotEmpty(handler)) {
+//            try {
+//                companyAccount = AxqCommonUtil.companyAccount(scyName, IDENTTYPECODE, scySocialCode, phoneNumber, scyPhone, AUTHENTICATIONMODE, handler, TYPECODE, handlerCard,new HttpConnector(jksPath,keyStorePassword,channel,platId));
+//                }catch (Exception e) {
+//                throw new Exception("开户失败!");
+//                }
+//        }else{
+//            try {
+//                companyAccount = AxqCommonUtil.companyAccount(scyName, IDENTTYPECODE, scySocialCode, phoneNumber, scyPhone, AUTHENTICATIONMODE, scyLegal, TYPECODE, scyLegalId,new HttpConnector(jksPath,keyStorePassword,channel,platId));
+//            }catch (Exception e) {
+//                throw new Exception("开户失败!");
+//            }
+//            }
+//        System.out.print("开户结果==========>" + companyAccount);
+//        //返回cfca用户id
+//        if(companyAccount.getJSONObject("enterprise")!=null||CommonUtil.isNotEmpty(companyAccount.getJSONObject("enterprise").getString("userId"))){
+//            String userId = companyAccount.getJSONObject("enterprise").getString("userId");
+//            sysCompany.setScyCfcaUserId(userId);
+//        }else{
+//            throw new Exception("开户失败!");
+//        }
         sysCompanyService.updateSysCompany(sysCompany);
         //查询企业
         LambdaQueryWrapper<SysCompany> company = new LambdaQueryWrapper<>();

tianhu-system/src/main/java/com/tianhu/system/companyAuth/service/impl/OwnAuthServiceImpl.java

@@ -111,7 +111,11 @@ public class OwnAuthServiceImpl implements IOwnAuthService {
                 String scyEndTime = wordsResult.getJSONObject("有效期").getString("words");
             if(CommonUtil.isNotEmpty(scyEndTime)&&!"无".equals(scyEndTime)) {
                 scyEndTime = scyEndTime.replace("年", "-").replace("月", "-").replace("日", "");
-                sysCompany.setScyEndTime(scyEndTime);
+                if(!"--".equals(scyEndTime)){
+                    sysCompany.setScyEndTime(scyEndTime);
+                }else{
+                    sysCompany.setScyEndTime("");
+                }
             }else{
                 sysCompany.setScyEndTime("");
             }

tianhu-system/src/main/java/com/tianhu/system/controller/OwnSysUserController.java

@@ -1,8 +1,8 @@
 package com.tianhu.system.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.keao.tianhu.core.entity.R;
 import com.tianhu.common.core.constant.SalaryConstants;
+import com.tianhu.common.core.domain.R;
 import com.tianhu.common.core.utils.CommonUtil;
 import com.tianhu.common.core.utils.DateUtils;
 import com.tianhu.common.core.utils.IdUtils;
@@ -328,6 +328,7 @@ public class OwnSysUserController extends BaseController
         Map map = new HashMap<>();
         LambdaQueryWrapper<ZcHandlerChange> lambdaQueryWrapper = new LambdaQueryWrapper();
         lambdaQueryWrapper.eq(ZcHandlerChange::getZhcToUserId,userId);
+        lambdaQueryWrapper.eq(ZcHandlerChange::getZhcStatus,"00");
         List<ZcHandlerChange> managementFile = zcHandlerChangeService.findZcHandlerChanges(lambdaQueryWrapper);
         List<Map> dailyResult = new ArrayList();
         for(int i=0;i<managementFile.size();i++){
@@ -378,6 +379,71 @@ public class OwnSysUserController extends BaseController
     }
 
     /**
+     * 查询是否经办人
+     *
+     * @return
+     */
+    @PostMapping("/qperatorQuery")
+    public R qperatorQuery() throws Exception {
+        //获取当前操作人员
+        LoginUser userInfo = tokenService.getLoginUser();
+        String companyId = userInfo.getSysUser().getCompanyId();
+        Long userId = userInfo.getSysUser().getUserId();
+        //查询是否经办人
+        LambdaQueryWrapper<SysUserCompanyRel> userCompany = new LambdaQueryWrapper<>();
+        userCompany.eq(SysUserCompanyRel::getSucrCompanyId,companyId);
+        userCompany.eq(SysUserCompanyRel::getSucrUserId,userId);
+        List<SysUserCompanyRel> sysUserCompanyRels = sysUserCompanyRelService.findSysUserCompanyRels(userCompany);
+        return R.ok(sysUserCompanyRels);
+    }
+
+    /**
+     * 平台经办人待办
+     *
+     * @return
+     */
+    @PostMapping("/handlerDo")
+    public R handlerDo(@RequestBody Map<String,Object> map
+    ) throws Exception {
+        //查询经办人待办
+        LambdaQueryWrapper<ZcHandlerChange> handleChange = new LambdaQueryWrapper<>();
+        handleChange.eq(ZcHandlerChange::getZhcCompanyId,CommonUtil.objToString(map.get("scyId")));
+        handleChange.eq(ZcHandlerChange::getZhcToUserId,CommonUtil.objToString(map.get("userId")));
+        handleChange.eq(ZcHandlerChange::getZhcStatus,"00");
+        List<ZcHandlerChange> zcHandlerChange = zcHandlerChangeService.findZcHandlerChanges(handleChange);
+        Map maps = new HashMap();
+        if(zcHandlerChange.size()>0){
+            maps.put("handleChange","00");
+        }else{
+            maps.put("handleChange","01");
+        }
+        return R.ok(maps);
+    }
+
+    /**
+     * 用户经办人待办
+     *
+     * @return
+     */
+    @PostMapping("/handleUser")
+    public R handleUser() throws Exception {
+        //获取当前操作人员
+        LoginUser userInfo = tokenService.getLoginUser();
+        String companyId = userInfo.getSysUser().getCompanyId();
+        //查询经办人待办
+        LambdaQueryWrapper<ZcHandlerChange> handleChange = new LambdaQueryWrapper<>();
+        handleChange.eq(ZcHandlerChange::getZhcCompanyId,companyId);
+        handleChange.eq(ZcHandlerChange::getZhcStatus,"00");
+        List<ZcHandlerChange> zcHandlerChange = zcHandlerChangeService.findZcHandlerChanges(handleChange);
+        Map map = new HashMap();
+        if(zcHandlerChange.size()>0){
+            map.put("handleCompany","00");
+        }else{
+            map.put("handleCompany","01");
+        }
+        return R.ok(map);
+    }
+    /**
      * 获取当前用户信息
      * @return
      */
@@ -409,28 +475,58 @@ public class OwnSysUserController extends BaseController
         if (userCompanyRels.size()==0){
             throw new Exception("当前用户无法变更权限!");
         }
-        //删除当前用户角色权限
-        sysUserRoleService.deleteSysUserRoleById(use.getUserId());
-        //新增当前用户角色关联
         SysRole sysRole =new SysRole();
-        sysRole.setIsAuto("0");
+        sysRole.setCompanyId(use.getCompanyId());
+        sysRole.setIsAuto("1");
         List<SysRole> role = roleService.selectRoleList(sysRole);
-
+        //删除当前用户角色权限
+        Map map = new HashMap();
+        map.put("userId", use.getUserId());
+        map.put("roleId", role.get(0).getRoleId());
+        sysUserRoleService.deleteSysUserRoleByURId(map);
+        //新增当前用户角色关联
+        SysRole sysRole3 =new SysRole();
+        sysRole3.setCompanyId(use.getCompanyId());
+        sysRole3.setIsAuto("0");
+        List<SysRole> roles = roleService.selectRoleList(sysRole3);
         SysUserRole sysUserRole =new SysUserRole();
-        sysUserRole.setRoleId(role.get(0).getRoleId());
+        sysUserRole.setRoleId(roles.get(0).getRoleId());
         sysUserRole.setUserId(use.getUserId());
         sysUserRoleService.insertSysUserRole(sysUserRole);
+        //变更经办人状态
+        SysUserCompanyRel sysUserCompanyRel1 =new SysUserCompanyRel();
+        sysUserCompanyRel1.setSucrHandler("0");
+        LambdaQueryWrapper<SysUserCompanyRel> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(SysUserCompanyRel::getSucrUserId,use.getUserId());
+        lambdaQueryWrapper.eq(SysUserCompanyRel::getSucrCompanyId,use.getCompanyId());
+        lambdaQueryWrapper.orderByAsc(SysUserCompanyRel::getCreateTime);
+        sysUserCompanyRelService.update(sysUserCompanyRel1,lambdaQueryWrapper);
+
+        SysRole sysRole1 =new SysRole();
+        sysRole1.setCompanyId(use.getCompanyId());
+        sysRole1.setIsAuto("0");
+        List<SysRole> role2 = roleService.selectRoleList(sysRole1);
         //删除授权用户角色
-        sysUserRoleService.deleteSysUserRoleById(userId);
+        Map maps = new HashMap();
+        maps.put("userId", userId);
+        maps.put("roleId", role2.get(0).getRoleId());
+        sysUserRoleService.deleteSysUserRoleByURId(maps);
         //新增授权用户角色关联
-        SysRole sysRole1 =new SysRole();
-        sysRole1.setIsAuto("1");
-        List<SysRole> role1 = roleService.selectRoleList(sysRole1);
-
+        SysRole sysRole4 =new SysRole();
+        sysRole4.setCompanyId(use.getCompanyId());
+        sysRole4.setIsAuto("1");
+        List<SysRole> role1 = roleService.selectRoleList(sysRole4);
         SysUserRole sysUserRole1 =new SysUserRole();
         sysUserRole1.setRoleId(role1.get(0).getRoleId());
         sysUserRole1.setUserId(userId);
         sysUserRoleService.insertSysUserRole(sysUserRole1);
+        //变更经办人状态
+        SysUserCompanyRel sysUserCompanyRel2 =new SysUserCompanyRel();
+        sysUserCompanyRel2.setSucrHandler("1");
+        LambdaQueryWrapper<SysUserCompanyRel> lambdaQueryWrapper1 = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper1.eq(SysUserCompanyRel::getSucrUserId,userId);
+        lambdaQueryWrapper1.eq(SysUserCompanyRel::getSucrCompanyId,use.getCompanyId());
+        sysUserCompanyRelService.update(sysUserCompanyRel2,lambdaQueryWrapper1);
         return AjaxResult.success();
     }
     /**
@@ -455,7 +551,7 @@ public class OwnSysUserController extends BaseController
         //用户信息变更申请书
         List<Map<String,String>> sqsList = (List<Map<String, String>>) map.get("sqsList");
         if(sqsList.size()==0){
-            throw new Exception("用户信息变更申请书");
+            throw new Exception("请上传用户信息变更申请书");
         }
         //查询经办人
         LambdaQueryWrapper<SysUserCompanyRel> sysUserCompanyRel = new LambdaQueryWrapper<>();
@@ -487,58 +583,76 @@ public class OwnSysUserController extends BaseController
     @PreAuthorize(hasPermi = "system:ownUser:confirmChange")
     @Transactional(rollbackFor=Exception.class)
     @Log(title = "确认变更经办人权限", businessType = BusinessType.UPDATE)
-    @PostMapping("/confirmChange/{userId}")
-    public AjaxResult confirmChange(@PathVariable(value = "userId", required = false) Long userId) throws Exception {
+    @PostMapping("/confirmChange")
+    public R confirmChange(@RequestBody Map<String,Object> map) throws Exception {
         //查询当前操作员
         LoginUser userInfo = tokenService.getLoginUser();
         SysUser use = userInfo.getSysUser();
-        //查询经办人
-        LambdaQueryWrapper<SysUserCompanyRel> sysUserCompanyRel = new LambdaQueryWrapper<>();
-        sysUserCompanyRel.eq(SysUserCompanyRel::getSucrUserId,use.getUserId());
-        sysUserCompanyRel.eq(SysUserCompanyRel::getSucrHandler,"1");
-        List<SysUserCompanyRel> userCompanyRels = sysUserCompanyRelService.findSysUserCompanyRels(sysUserCompanyRel);
-        if (userCompanyRels.size()==0){
-            throw new Exception("当前用户无法变更权限!");
+        //查询变更申请
+        LambdaQueryWrapper<ZcHandlerChange> handlerChange = new LambdaQueryWrapper<>();
+        handlerChange.eq(ZcHandlerChange::getZhcToUserId,Long.valueOf(CommonUtil.objToString(map.get("userId"))));
+        handlerChange.eq(ZcHandlerChange::getZhcCompanyId,CommonUtil.objToString(map.get("scyId")));
+        handlerChange.eq(ZcHandlerChange::getZhcStatus,"00");
+        List<ZcHandlerChange> zcHandlerChange = zcHandlerChangeService.findZcHandlerChanges(handlerChange);
+        if(zcHandlerChange.size()==0){
+            throw new Exception("数据异常请联系管理员!");
         }
-        //删除当前用户角色权限
-        sysUserRoleService.deleteSysUserRoleById(use.getUserId());
-        //新增当前用户角色关联
+        //删除原经办人角色权限
+        sysUserRoleService.deleteSysUserRoleById(zcHandlerChange.get(0).getZhcUserId());
+        //新增原经办人角色关联
         SysRole sysRole =new SysRole();
+        sysRole.setCompanyId(CommonUtil.objToString(map.get("scyId")));
         sysRole.setIsAuto("0");
         List<SysRole> role = roleService.selectRoleList(sysRole);
 
         SysUserRole sysUserRole =new SysUserRole();
         sysUserRole.setRoleId(role.get(0).getRoleId());
-        sysUserRole.setUserId(use.getUserId());
+        sysUserRole.setUserId(zcHandlerChange.get(0).getZhcUserId());
         sysUserRoleService.insertSysUserRole(sysUserRole);
+        //变更经办人状态
+        SysUserCompanyRel sysUserCompanyRel1 =new SysUserCompanyRel();
+        sysUserCompanyRel1.setSucrHandler("0");
+        LambdaQueryWrapper<SysUserCompanyRel> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(SysUserCompanyRel::getSucrUserId,zcHandlerChange.get(0).getZhcUserId());
+        lambdaQueryWrapper.eq(SysUserCompanyRel::getSucrCompanyId,CommonUtil.objToString(map.get("scyId")));
+        sysUserCompanyRelService.update(sysUserCompanyRel1,lambdaQueryWrapper);
         //删除授权用户角色
-        sysUserRoleService.deleteSysUserRoleById(userId);
+        sysUserRoleService.deleteSysUserRoleById(Long.valueOf(CommonUtil.objToString(map.get("userId"))));
         //新增授权用户角色关联
         SysRole sysRole1 =new SysRole();
+        sysRole1.setCompanyId(CommonUtil.objToString(map.get("scyId")));
         sysRole1.setIsAuto("1");
         List<SysRole> role1 = roleService.selectRoleList(sysRole1);
 
         SysUserRole sysUserRole1 =new SysUserRole();
         sysUserRole1.setRoleId(role1.get(0).getRoleId());
-        sysUserRole1.setUserId(userId);
+        sysUserRole1.setUserId(Long.valueOf(CommonUtil.objToString(map.get("userId"))));
         sysUserRoleService.insertSysUserRole(sysUserRole1);
+        //变更经办人状态
+        SysUserCompanyRel sysUserCompanyRel2 =new SysUserCompanyRel();
+        sysUserCompanyRel2.setSucrHandler("1");
+        LambdaQueryWrapper<SysUserCompanyRel> lambdaQueryWrapper1 = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper1.eq(SysUserCompanyRel::getSucrUserId,Long.valueOf(CommonUtil.objToString(map.get("userId"))));
+        lambdaQueryWrapper1.eq(SysUserCompanyRel::getSucrCompanyId,CommonUtil.objToString(map.get("scyId")));
+        lambdaQueryWrapper1.orderByAsc(SysUserCompanyRel::getCreateTime);
+        sysUserCompanyRelService.update(sysUserCompanyRel2,lambdaQueryWrapper1);
         //查询经办人
         LambdaQueryWrapper<ZcHandlerChange> zchand = new LambdaQueryWrapper<>();
-        zchand.eq(ZcHandlerChange::getZhcToUserId,userId);
+        zchand.eq(ZcHandlerChange::getZhcToUserId,Long.valueOf(CommonUtil.objToString(map.get("userId"))));
         zchand.orderByDesc(ZcHandlerChange::getCreateTime);
-        List<ZcHandlerChange> handlerChange = zcHandlerChangeService.findZcHandlerChanges(zchand);
-                if(handlerChange.size()==0){
+        List<ZcHandlerChange> handlerChanges = zcHandlerChangeService.findZcHandlerChanges(zchand);
+                if(handlerChanges.size()==0){
                     throw new Exception("获取数据失败");
                 }
         //修改申请表状态
-        ZcHandlerChange zcHandlerChange =new ZcHandlerChange();
-        zcHandlerChange.setZhcId(handlerChange.get(0).getZhcId());
+        ZcHandlerChange zcHandlerChanges =new ZcHandlerChange();
+        zcHandlerChanges.setZhcId(handlerChanges.get(0).getZhcId());
         //变更状态(00:待平台处理, 01:平台已处理)
-        zcHandlerChange.setZhcStatus("01");
-        zcHandlerChange.setUpdateBy(use.getUserId()+"");
-        zcHandlerChange.setUpdateTime(DateUtils.getNowDate());
-        zcHandlerChangeService.updateZcHandlerChange(zcHandlerChange);
-        return AjaxResult.success();
+        zcHandlerChanges.setZhcStatus("01");
+        zcHandlerChanges.setUpdateBy(use.getUserId()+"");
+        zcHandlerChanges.setUpdateTime(DateUtils.getNowDate());
+        zcHandlerChangeService.updateZcHandlerChange(zcHandlerChanges);
+        return R.ok();
     }
     /**
      * 查询此用户下关联的企业

tianhu-system/src/main/java/com/tianhu/system/utils/RegularUtil.java

@@ -25,7 +25,7 @@ public class RegularUtil {
     private static final String COMPANYNAME  ="^[0-9A-Z\\u4E00-\\u9FFF《》()（）-]+$";
 
     //经办人校验
-    private static final String HANDLER  ="^[A-Za-z\\\\u4e00-\\\\u9fa5]+$";
+    private static final String HANDLER  ="^(?!.*\\..*\\.)[\\u4e00-\\u9fa5]([\\u4e00-\\u9fa5\\.]*|[A-Za-z\\.]*)$";
 
 
     /**

tianhu-system/src/main/resources/mapper/system/OwnSysUserMapper.xml

@@ -60,10 +60,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		u.remark	remark,
 		DATE_FORMAT(ucr.create_time,'%Y-%m-%d %T')	createTime,
 		u.remark remark,
-		ucr.sucr_handler,
+		ucr.sucr_handler sucrHandler,
 		c.scy_type scyType,
 		c.scy_id scyId,
 		c.scy_name scyName,
+		c.scy_status scyStatus,
 		d.dept_name deptName,
 		cast(d.dept_id as char) deptId
 		FROM sys_user_company_rel ucr
@@ -134,6 +135,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		</if>
 	</select>
 
+	<select id="selectUser" parameterType="map" resultType="map">
+		select
+		--                   姓名
+		ss_name     'ssName',
+		-- --                 手机号
+		ss_phone         'ssPhone',
+		--         公司id
+		ss_email          'email',
+		--         用户id
+		ss_id             'ssId',
+		ss_company_id    'ssCompanyId'
+		from  sys_staff_inf
+		where 1=1
+		<if test="ssName != null and ssName != ''">
+			and ss_name = #{ssName}
+		</if>
+		<if test="ssPhone != null and ssPhone != ''">
+			AND ss_phone = #{ssPhone}
+		</if>
+		<if test="ssCompanyId != null and ssCompanyId != ''">
+			AND ss_company_id = #{ssCompanyId}
+		</if>
+		<if test="staffId != null and staffId != ''">
+			and (ss_id = #{staffId} or ss_is_del = '00' and ss_state = '00')
+		</if>
+		<if test="staffId == null and staffId == ''">
+			and ss_is_del = '00' and ss_state = '00'
+		</if>
+	</select>
+
 	<resultMap type="SysUser" id="SysUserResult">
 		<id     property="userId"       column="user_id"      />
 		<result property="userName"     column="user_name"    />

tianhu-system/src/main/resources/mapper/system/SysRoleMapper.xml

@@ -57,9 +57,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		</if>
 		<!-- 数据范围过滤 -->
 		${params.dataScope}
-		order by r.create_time desc
+		order by r.create_time asc
 	</select>
-    
+
 	<select id="selectRolePermissionByUserId" parameterType="map" resultMap="SysRoleResult">
 		<include refid="selectRoleVo"/>
 		WHERE r.del_flag = '0'