diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/OrganizationalController.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/OrganizationalController.java index 2f4f104..b772b37 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/OrganizationalController.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/OrganizationalController.java @@ -321,12 +321,12 @@ public class OrganizationalController extends BaseController { /** * 班组注册 * - * @param bean + * @param * @return */ @RequestMapping(value = "registerTeamGroup", method = RequestMethod.POST) @ResponseBody - public AjaxRes registerTeamGroup(@RequestBody TeamGroupBean bean) { + public AjaxRes registerTeamGroup(@ModelAttribute TeamGroupBean bean) { AjaxRes ar = getAjaxRes(); if (!UserUtil.isPhone(bean.getPhone())) { ar.setFailMsg("手机号格式错误"); diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/TeamGroupServiceImpl.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/TeamGroupServiceImpl.java index bef27f1..ee56db6 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/TeamGroupServiceImpl.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/TeamGroupServiceImpl.java @@ -255,8 +255,12 @@ public class TeamGroupServiceImpl implements TeamGroupService { for (TeamGroupBean groupBean : registerList) { TeamGroupBean teamLeader = teamGroupDao.getTeamLeader(groupBean); groupBean.setTeamLeader(teamLeader.getName()); - groupBean.setPhone(teamLeader.getPhone()); - groupBean.setIdCard(teamLeader.getIdCard()); + if (StringUtils.isNotBlank(teamLeader.getPhone())) { + groupBean.setPhone(AesCbcUtils.encrypt(teamLeader.getPhone())); + } + if (StringUtils.isNotBlank(teamLeader.getIdCard())) { + groupBean.setIdCard(AesCbcUtils.encrypt(teamLeader.getIdCard())); + } groupBean.setPersonNum(teamLeader.getPersonNum()); } return registerList; diff --git a/src/main/java/com/bonus/gs/sub/evaluate/manager/config/SecurityHandlerConfig.java b/src/main/java/com/bonus/gs/sub/evaluate/manager/config/SecurityHandlerConfig.java index 01d1ebf..292f3d2 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/manager/config/SecurityHandlerConfig.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/manager/config/SecurityHandlerConfig.java @@ -15,9 +15,11 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.http.HttpStatus; import org.springframework.security.authentication.BadCredentialsException; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.core.Authentication; import org.springframework.security.core.AuthenticationException; import org.springframework.security.web.AuthenticationEntryPoint; +import org.springframework.security.web.SecurityFilterChain; import org.springframework.security.web.authentication.AuthenticationFailureHandler; import org.springframework.security.web.authentication.AuthenticationSuccessHandler; import org.springframework.security.web.authentication.logout.LogoutSuccessHandler; @@ -139,4 +141,28 @@ public class SecurityHandlerConfig { } +/* @Configuration + public class SecurityConfig { + @Bean + public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { + http.headers(headers -> headers + .contentSecurityPolicy(csp -> csp + .policyDirectives( + "default-src 'self'; " + + "script-src 'self' 'unsafe-inline' 'unsafe-eval'; " + + "style-src 'self' 'unsafe-inline'; " + + "img-src 'self' data: https:; " + + "font-src 'self'; " + + "connect-src 'self'; " + + "frame-src 'none'; " + + "object-src 'none'; " + + "base-uri 'self'; " + + "form-action 'self';" + ) + ) + ); + return http.build(); + } + }*/ + } diff --git a/src/main/java/com/bonus/gs/sub/evaluate/manager/controller/UserController.java b/src/main/java/com/bonus/gs/sub/evaluate/manager/controller/UserController.java index 54d7cc1..a86b20c 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/manager/controller/UserController.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/manager/controller/UserController.java @@ -140,6 +140,7 @@ public class UserController { List list = userDao.list(request.getParams(), request.getOffset(), request.getLimit()); for (SysUser sysUser : list) { String phone = sysUser.getPhone(); + sysUser.setPassword(null); if (StringUtils.isNotBlank(phone)) { sysUser.setPhone(AesCbcUtils.encrypt(phone)); } diff --git a/src/main/resources/mappers/evaluate/TeamGroupMapper.xml b/src/main/resources/mappers/evaluate/TeamGroupMapper.xml index aaefc5e..fc1ef2b 100644 --- a/src/main/resources/mappers/evaluate/TeamGroupMapper.xml +++ b/src/main/resources/mappers/evaluate/TeamGroupMapper.xml @@ -202,6 +202,7 @@ poi.create_time createTime, poi.info_file_url infoFileUrl, poi.audit_status auditStatus, + su.username applyMan, CASE WHEN poi.audit_status = 0 THEN '草稿' WHEN poi.audit_status = 1 THEN '待事业部审核' @@ -212,6 +213,7 @@ END AS auditStatusName FROM pm_org_info poi + left join sys_user su ON su.id = poi.apply_man WHERE poi.audit_status IS NOT NULL AND poi.LEVEL = 5 diff --git a/src/main/resources/mappers/user/NewUserMapper.xml b/src/main/resources/mappers/user/NewUserMapper.xml index b4e9bdb..de41f85 100644 --- a/src/main/resources/mappers/user/NewUserMapper.xml +++ b/src/main/resources/mappers/user/NewUserMapper.xml @@ -33,7 +33,6 @@ left join sys_role_user sru on t.id = sru.userId left join sys_role sr on sru.roleId = sr.id - ${params.orderBy} limit #{offset}, #{limit} ',j=f.sSearch;j=j.match(/_INPUT_/)?j.replace("_INPUT_",i):j+i;var k=a("
",{"id":h.f?null:e+"_filter","class":d.sFilter}).append(a("