Merge branch 'gzdyh_prod'

xusd

2 days ago c490640493f04e2ed0fc5c4c8fbc92ebdd4d5380

 dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtAccountService.java

@@ -626,7 +626,7 @@
        } else if (parts.length >= 4) {
            return parts[0] + parts[1] + parts[2] + "-" + parts[3];
        } else if (parts.length >= 5) {
            return parts[0] + parts[1] + parts[2] + "-" + parts[3]+"-" + parts[4];
            return parts[0] + parts[1] + parts[2] + "-" + parts[3] + "-" + parts[4];
        } else {
            return input; // 或抛出异常
        }
@@ -674,7 +674,7 @@
        GridUserRoleVo gridUserRoleVo = new GridUserRoleVo();
        gridUserRoleVo.setUserId(userId);
        GridUserRoleDTO userRoleDTO = sysClient.getUserRoleList(gridUserRoleVo);
        if (StringUtils.isEmpty(userRoleDTO.getRoleName()) || !userRoleDTO.getRoleName().contains("（M）")) {
        if (StringUtils.isEmpty(userRoleDTO.getRoleName()) || (!userRoleDTO.getRoleName().contains("（M）") && !userRoleDTO.getRoleName().contains("领导") && !userRoleDTO.getRoleName().contains("调度干部"))) {
            return ReturnFailUtils.getRepInfo("该用户没有矛调系统的权限");
        }
        CtUserole ctUserole = new CtUserole();
@@ -730,7 +730,7 @@
            switch (grade) {
                case 1:
                    //市级级
                    ctUnit.setLevel(grade );
                    ctUnit.setLevel(grade);
                    ctUnit.setUnitGrade(grade);
                    ctUnit.setUnitType(UserBaseConsts.UNIT_TYPE_102);
                    ctUnit.setParentId("2024000000000001");