提交user，用户app菜单权限

eladmin-system/src/main/java/me/zhengjie/modules/dm/user/repository/DmUserRepository.java

@@ -74,6 +74,7 @@ public interface DmUserRepository extends JpaRepository<DmUser, String>, JpaSpec
      * 根据用户id删除用户系统表数据
      * @param userId
      */
+    @Transactional
     @Modifying
     @Query(value = "delete from dm_user_menu where user_id = :userId", nativeQuery = true)
     void deleteUserAppMenu(@Param("userId") String userId);

eladmin-system/src/main/java/me/zhengjie/modules/system/domain/User.java

@@ -19,6 +19,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import me.zhengjie.base.BaseEntity;
+import me.zhengjie.modules.dm.appMenu.domain.DmAppMenu;
 import me.zhengjie.modules.dm.company.domain.DmCompany;
 import me.zhengjie.modules.dm.user.domain.DmUser;
 import me.zhengjie.modules.system.service.dto.UserDto;
@@ -147,8 +148,13 @@ public class User extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "根用户组名称", hidden = true)
     private String userRootGroupName;
 
-    @Transient
-   private List<Map<String,Object>> userMenu;
+
+    @ManyToMany
+    @ApiModelProperty(value = "用户岗位")
+    @JoinTable(name = "dm_user_menu",
+            joinColumns = {@JoinColumn(name = "user_id",referencedColumnName = "user_id")},
+            inverseJoinColumns = {@JoinColumn(name = "app_menu_id",referencedColumnName = "id")})
+   private Set<DmAppMenu> userMenu;
 
     @Override
     public boolean equals(Object o) {

eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/UserDto.java

@@ -19,6 +19,7 @@ import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Getter;
 import lombok.Setter;
 import me.zhengjie.base.BaseDTO;
+import me.zhengjie.modules.dm.appMenu.domain.DmAppMenu;
 import me.zhengjie.modules.dm.company.domain.DmCompany;
 import me.zhengjie.modules.dm.company.service.dto.DmCompanyDto;
 import me.zhengjie.modules.dm.user.domain.DmUser;
@@ -87,4 +88,6 @@ public class UserDto extends BaseDTO implements Serializable {
     private String userRootGroupId;
 
     private String userRootGroupName;
+
+    private Set<DmAppMenu> userMenu;
 }

eladmin-system/src/main/java/me/zhengjie/modules/thirdparty/v1/UserApiController.java

@@ -408,19 +408,19 @@ public class UserApiController {
         return new ResponseEntity<>(dmSystemService.queryAll(params.getQuery(),pageable),HttpStatus.OK);
     }
 
-    @Log("根据用户id查询app菜单权限")
-    @ApiOperation("根据用户id查询app菜单权限")
-    @AnonymousPostMapping(value = "/queryUserAppMenu")
-    public ResponseEntity<Object> queryUserAppMenu(@RequestBody QueryPageParams<String> params){
-        SecurityUtils.CheckApiAuth(params);
-        List<Map<String, Object>> map =  dmUserService.queryUserAppMenu(params.getQuery());
-        return new ResponseEntity<>(map,HttpStatus.OK);
-    }
-
-    @Log("查询app菜单权限")
-    @ApiOperation("查询app菜单权限")
-    @AnonymousGetMapping(value = "/queryAppMenu")
-    public ResponseEntity<Object> queryAppMenu(DmAppMenuQueryCriteria criteria, Pageable pageable){
-        return new ResponseEntity<>(dmAppMenuService.queryAll(criteria,pageable),HttpStatus.OK);
-    }
+//    @Log("根据用户id查询app菜单权限")
+//    @ApiOperation("根据用户id查询app菜单权限")
+//    @AnonymousPostMapping(value = "/queryUserAppMenu")
+//    public ResponseEntity<Object> queryUserAppMenu(@RequestBody QueryPageParams<String> params){
+//        SecurityUtils.CheckApiAuth(params);
+//        List<Map<String, Object>> map =  dmUserService.queryUserAppMenu(params.getQuery());
+//        return new ResponseEntity<>(map,HttpStatus.OK);
+//    }
+//
+//    @Log("查询app菜单权限")
+//    @ApiOperation("查询app菜单权限")
+//    @AnonymousGetMapping(value = "/queryAppMenu")
+//    public ResponseEntity<Object> queryAppMenu(DmAppMenuQueryCriteria criteria, Pageable pageable){
+//        return new ResponseEntity<>(dmAppMenuService.queryAll(criteria,pageable),HttpStatus.OK);
+//    }
 }