档案相关权限-优化

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeInfoController.java

@@ -83,7 +83,7 @@ public class TEmployeeInfoController {
 		}
 		menuUtil.setAuthSql(user, tEmployeeInfo);
 		if (Common.isNotNull(tEmployeeInfo.getAuthSql()) && tEmployeeInfo.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {
-			tEmployeeInfo.setAuthSql(tEmployeeInfo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "b.id"));
+			tEmployeeInfo.setAuthSql(tEmployeeInfo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "b.DEPT_ID "));
 		}
 		return R.ok(tEmployeeInfoService.getPage(page, tEmployeeInfo));
 	}

yifu-upms/yifu-upms-biz/src/main/java/com/yifu.cloud.plus.v1/yifu/admin/controller/UserController.java

@@ -303,7 +303,7 @@ public class UserController {
 	@Inner
 	@PostMapping(value = {"/inner/getUserIdByDeptIds"})
 	public String getUserIdByDeptIds(@RequestBody String deptIds) {
-		StringBuilder userIds = new StringBuilder("0");
+		StringBuilder userIds = new StringBuilder("'0'");
 		if (Common.isNotNull(deptIds)) {
 			List<SysUser> sysUsers = userService.list(Wrappers.<SysUser>query().lambda().in(SysUser::getDeptId, deptIds));
 			if (Common.isNotEmpty(sysUsers)){

yifu-upms/yifu-upms-biz/src/main/java/com/yifu.cloud.plus.v1/yifu/admin/service/impl/SysDataAuthServiceImpl.java

@@ -108,13 +108,13 @@ public class SysDataAuthServiceImpl extends ServiceImpl<SysDataAuthMapper, SysDa
 		// 处理权限部门
 		if (sysDataAuth.getIsDeptAuth() == 1 || sysDataAuth.getIsDeptAuth() == 2) {
 			if (sysDataAuth.getIsDeptAuth() == 2) {
-				sql.append(" or a.create_user in (start'0' ");
+				sql.append(" or a.CREATE_BY in (start'0' ");
 				for (SysDataAuthDeptRel dept : authDeptList) {
 					sql.append(", '").append(dept.getDeptId()).append("'");
 				}
 				sql.append("end)");
 			} else {
-				sql.append(" or a.create_user in (#deptId) ");
+				sql.append(" or a.CREATE_BY in (#deptId) ");
 			}
 			for (SysDataAuthMenuRel menu : menuDeptList) {
 				authSqlMap.put(linkId + CommonConstants.DOWN_LINE_STRING + menu.getMenuId(), sql.toString());
@@ -314,7 +314,7 @@ public class SysDataAuthServiceImpl extends ServiceImpl<SysDataAuthMapper, SysDa
 			if (menuDeptList == null || menuDeptList.isEmpty()) {
 				return R.failed("请选择部门关联的菜单！");
 			} else if (sysDataAuth.getIsDeptAuth() == 2) {
-				sql.append(" or a.create_user in (start'0' ");
+				sql.append(" or a.CREATE_BY in (start'0' ");
 				for (SysDataAuthDeptRel dept : authDeptList) {
 					sql.append(", '").append(dept.getDeptId()).append("'");
 					dept.setSysDataAuthId(mainId);
@@ -322,7 +322,7 @@ public class SysDataAuthServiceImpl extends ServiceImpl<SysDataAuthMapper, SysDa
 				sql.append("end)");
 				authDeptRelService.saveOrUpdateBatch(authDeptList);
 			} else {
-				sql.append(" or a.create_user in (#deptId) ");
+				sql.append(" or a.CREATE_BY in (#deptId) ");
 			}
 			for (SysDataAuthMenuRel menu : menuDeptList) {
 				authSqlMap.put(linkId + CommonConstants.DOWN_LINE_STRING + menu.getMenuId(), sql.toString());