feat:权限

haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/controller/HaobanRoleController.java

@@ -62,8 +62,8 @@ public class HaobanRoleController {
      * 根据类型查询菜单
      * @return
      */
-    @RequestMapping(value = "/queryMenuByRoleId",method = RequestMethod.GET)
-    private RestResponse<HaobanRoleDTO> queryMenuByRoleId(Integer clerkType, String wxEnterpriseId) {
+    @RequestMapping(value = "/queryMenuByClerkType",method = RequestMethod.GET)
+    private RestResponse<HaobanRoleDTO> queryMenuByClerkType(Integer clerkType, String wxEnterpriseId) {
         ServiceResponse<HaobanRoleDTO> serviceResponse = haobanRoleApiService.getMenuByWxEnterpriseIdAndClerkType(wxEnterpriseId, clerkType);
         return RestResponse.successResult(serviceResponse.getResult());
     }

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/HaobanRoleController.java

@@ -5,6 +5,7 @@ import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
 import com.gic.haoban.common.utils.AuthWebRequestUtil;
 import com.gic.haoban.manage.api.dto.qdto.role.HaobanRoleQDTO;
+import com.gic.haoban.manage.api.dto.role.HaobanMenuDTO;
 import com.gic.haoban.manage.api.dto.role.HaobanRoleDTO;
 import com.gic.haoban.manage.api.service.role.HaobanMenuApiService;
 import com.gic.haoban.manage.api.service.role.HaobanRoleApiService;
@@ -16,6 +17,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @author mozhu
  * @date 2022/9/7 3:03 下午
@@ -32,18 +35,6 @@ public class HaobanRoleController extends WebBaseController{
     private HaobanMenuApiService haobanMenuApiService;
 
     /**
-     * 新增
-     * @param haobanRoleQDTO
-     * @return
-     */
-    @RequestMapping(value = "/add",method = RequestMethod.POST)
-    private RestResponse add(@RequestBody HaobanRoleQDTO haobanRoleQDTO) {
-        WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
-        haobanRoleApiService.add(haobanRoleQDTO,login);
-        return RestResponse.successResult();
-    }
-
-    /**
      * 修改
      * @param haobanRoleQDTO
      * @return
@@ -60,9 +51,9 @@ public class HaobanRoleController extends WebBaseController{
      * @return
      */
     @RequestMapping(value = "/getHaobanMenuTreeList",method = RequestMethod.GET)
-    private RestResponse getHaobanMenuTreeList(Integer clerkType) {
+    private RestResponse<List<HaobanMenuDTO>> getHaobanMenuTreeList(Integer clerkType) {
         WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
-        ServiceResponse serviceResponse = haobanMenuApiService.getHaobanMenuTreeList(login.getWxEnterpriseId(), clerkType);
+        ServiceResponse<List<HaobanMenuDTO>> serviceResponse = haobanMenuApiService.getHaobanMenuTreeList(login.getWxEnterpriseId(), clerkType);
         return RestResponse.successResult(serviceResponse.getResult());
     }
 
@@ -70,8 +61,8 @@ public class HaobanRoleController extends WebBaseController{
      * 根据角色查询菜单
      * @return
      */
-    @RequestMapping(value = "/queryMenuByRoleId",method = RequestMethod.GET)
-    private RestResponse<HaobanRoleDTO> queryMenuByRoleId(Integer clerkType) {
+    @RequestMapping(value = "/queryMenuByClerkType",method = RequestMethod.GET)
+    private RestResponse<HaobanRoleDTO> queryMenuByClerkType(Integer clerkType) {
         WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
         ServiceResponse<HaobanRoleDTO> serviceResponse = haobanRoleApiService.getMenuByWxEnterpriseIdAndClerkType(login.getWxEnterpriseId(), clerkType);
         return RestResponse.successResult(serviceResponse.getResult());