diff --git a/resource/WEB-INF/salaryoptconfig.xml b/resource/WEB-INF/salaryoptconfig.xml index 7b25b32bb..50c587934 100644 --- a/resource/WEB-INF/salaryoptconfig.xml +++ b/resource/WEB-INF/salaryoptconfig.xml @@ -21,26 +21,7 @@ - - - - - - - - - - - - - - - - - - - - + diff --git a/src/com/engine/salary/entity/auth/dto/AuthDTO.java b/src/com/engine/salary/entity/auth/dto/AuthDTO.java index 4a3b6cf56..f2ebaef7b 100644 --- a/src/com/engine/salary/entity/auth/dto/AuthDTO.java +++ b/src/com/engine/salary/entity/auth/dto/AuthDTO.java @@ -14,6 +14,6 @@ import java.util.List; public class AuthDTO { private Long taxAgentId; - private List empOpts; + private List emps; } diff --git a/src/com/engine/salary/entity/auth/dto/EmpOpt.java b/src/com/engine/salary/entity/auth/dto/EmpOpt.java index e77cda1c4..1a2a59920 100644 --- a/src/com/engine/salary/entity/auth/dto/EmpOpt.java +++ b/src/com/engine/salary/entity/auth/dto/EmpOpt.java @@ -13,7 +13,6 @@ import java.util.List; @AllArgsConstructor public class EmpOpt { private Long employeeId; - - private List opt; + private List opts; } diff --git a/src/com/engine/salary/entity/auth/dto/Opt.java b/src/com/engine/salary/entity/auth/dto/Opt.java new file mode 100644 index 000000000..872139ddf --- /dev/null +++ b/src/com/engine/salary/entity/auth/dto/Opt.java @@ -0,0 +1,17 @@ +package com.engine.salary.entity.auth.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class Opt { +// private Long id; +// private String page; + private String opt; +} + diff --git a/src/com/engine/salary/entity/auth/param/AuthRoleSaveParam.java b/src/com/engine/salary/entity/auth/param/AuthRoleSaveParam.java index 844453be1..658fae915 100644 --- a/src/com/engine/salary/entity/auth/param/AuthRoleSaveParam.java +++ b/src/com/engine/salary/entity/auth/param/AuthRoleSaveParam.java @@ -23,6 +23,10 @@ public class AuthRoleSaveParam { @DataCheck(require = true, max = 40, message = "鍚嶇О涓嶅厑璁镐负绌,鍚嶇О涓嶈兘瓒呰繃40涓瓧绗") private String name; +// +// @DataCheck(require = true, max = 400, message = "鍚嶇О涓嶅厑璁镐负绌,鍚嶇О涓嶈兘瓒呰繃400涓瓧绗") +// private String description; + /** * 鎵g即涔夊姟浜篿d */ diff --git a/src/com/engine/salary/mapper/auth/AuthMapper.java b/src/com/engine/salary/mapper/auth/AuthMapper.java index c209fd174..e762c6511 100644 --- a/src/com/engine/salary/mapper/auth/AuthMapper.java +++ b/src/com/engine/salary/mapper/auth/AuthMapper.java @@ -1,10 +1,11 @@ package com.engine.salary.mapper.auth; import com.engine.salary.entity.auth.dto.AuthDTO; +import org.apache.ibatis.annotations.Param; import java.util.List; public interface AuthMapper { - List getAuth(); + List getAuth(@Param("uid") Long uid, @Param("page") String page); } \ No newline at end of file diff --git a/src/com/engine/salary/mapper/auth/AuthMapper.xml b/src/com/engine/salary/mapper/auth/AuthMapper.xml index fc440a252..9a29df352 100644 --- a/src/com/engine/salary/mapper/auth/AuthMapper.xml +++ b/src/com/engine/salary/mapper/auth/AuthMapper.xml @@ -2,21 +2,25 @@ - - - - + + + + + + + + diff --git a/src/com/engine/salary/web/AuthController.java b/src/com/engine/salary/web/AuthController.java index 80dd3981a..1d2fc833e 100644 --- a/src/com/engine/salary/web/AuthController.java +++ b/src/com/engine/salary/web/AuthController.java @@ -123,12 +123,12 @@ public class AuthController { return new ResponseResult(user).run(getAuthWrapper(user)::syncData, roleId); } - @POST + @GET @Path("/data/auth") @Produces(MediaType.APPLICATION_JSON) - public String auth(@Context HttpServletRequest request, @Context HttpServletResponse response) { + public String auth(@Context HttpServletRequest request, @Context HttpServletResponse response,@QueryParam(value = "page") String page) { User user = HrmUserVarify.getUser(request, response); - return new ResponseResult(user).run(getAuthWrapper(user)::auth); + return new ResponseResult(user).run(getAuthWrapper(user)::auth,page); } diff --git a/src/com/engine/salary/wrapper/AuthWrapper.java b/src/com/engine/salary/wrapper/AuthWrapper.java index 74b254fe1..ec03226dd 100644 --- a/src/com/engine/salary/wrapper/AuthWrapper.java +++ b/src/com/engine/salary/wrapper/AuthWrapper.java @@ -121,7 +121,8 @@ public class AuthWrapper extends Service { private AuthMapper getAuthMapper() { return MapperProxyFactory.getProxy(AuthMapper.class); } - public Object auth() { - return getAuthMapper().getAuth(); + + public Object auth(String page) { + return getAuthMapper().getAuth((long) user.getUID(), page); } }