权限问题

boman-modules/boman-system/src/main/java/com/boman/system/controller/BomanGroupController.java

@@ -31,7 +31,7 @@ public class BomanGroupController extends BaseController
     /**
      * 获取自定义组
      */
-    @PreAuthorize(hasPermi = "system:group:list")
+//    @PreAuthorize(hasPermi = "system:group:list")
     @GetMapping("/list")
     public AjaxResult list(BomanGroup bomanGroup)
     {
@@ -43,7 +43,7 @@ public class BomanGroupController extends BaseController
     /**
      * 根据组织编号获取详细信息
      */
-    @PreAuthorize(hasPermi = "system:group:query")
+//    @PreAuthorize(hasPermi = "system:group:query")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable Long id)
     {
@@ -53,7 +53,7 @@ public class BomanGroupController extends BaseController
     /**
      * 新增组织
      */
-    @PreAuthorize(hasPermi = "system:group:add")
+//    @PreAuthorize(hasPermi = "system:group:add")
     @Log(title = "组织管理", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@Validated @RequestBody BomanGroup bomanGroup)
@@ -69,7 +69,7 @@ public class BomanGroupController extends BaseController
     /**
      * 修改组织
      */
-    @PreAuthorize(hasPermi = "system:group:edit")
+//    @PreAuthorize(hasPermi = "system:group:edit")
     @Log(title = "部门管理", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     public AjaxResult edit(@Validated @RequestBody BomanGroup bomanGroup)
@@ -85,7 +85,7 @@ public class BomanGroupController extends BaseController
     /**
      * 删除组织
      */
-    @PreAuthorize(hasPermi = "system:group:remove")
+//    @PreAuthorize(hasPermi = "system:group:remove")
     @Log(title = "组织管理", businessType = BusinessType.DELETE)
     @GetMapping("/delete/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
@@ -122,7 +122,7 @@ public class BomanGroupController extends BaseController
     /**
      * 根据组织编号获取对应组织所有用户的用户id,用户名,部门名称,角色名
      */
-    @PreAuthorize(hasPermi = "system:role:user")
+//    @PreAuthorize(hasPermi = "system:role:user")
     @GetMapping(value = "/user/{groupId}")
     public AjaxResult getUserInfo(@PathVariable Long groupId)
     {

boman-modules/boman-system/src/main/java/com/boman/system/controller/SysDeptController.java

@@ -39,7 +39,7 @@ public class SysDeptController extends BaseController
     /**
      * 获取部门列表
      */
-    @PreAuthorize(hasPermi = "system:dept:list")
+//    @PreAuthorize(hasPermi = "system:dept:list")
     @GetMapping("/list")
     public AjaxResult list(SysDept dept)
     {
@@ -50,7 +50,7 @@ public class SysDeptController extends BaseController
     /**
      * 查询部门列表（排除节点）
      */
-    @PreAuthorize(hasPermi = "system:dept:list")
+//    @PreAuthorize(hasPermi = "system:dept:list")
     @GetMapping("/list/exclude/{id}")
     public AjaxResult excludeChild(@PathVariable(value = "id", required = false) Long id)
     {
@@ -82,7 +82,7 @@ public class SysDeptController extends BaseController
     /**
      * 根据部门编号获取详细信息
      */
-    @PreAuthorize(hasPermi = "system:dept:query")
+//    @PreAuthorize(hasPermi = "system:dept:query")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable Long id)
     {
@@ -93,7 +93,7 @@ public class SysDeptController extends BaseController
     /**
      * 根据部门编号获取用户
      */
-    @PreAuthorize(hasPermi = "system:dept:user")
+//    @PreAuthorize(hasPermi = "system:dept:user")
     @GetMapping(value = "/user/{id}")
     public AjaxResult getUserInfo(@PathVariable(name = "id") Long id)
     {
@@ -104,7 +104,7 @@ public class SysDeptController extends BaseController
     /**
      * 根据部门编号获取详细信息
      */
-    @PreAuthorize(hasPermi = "system:dept:query")
+//    @PreAuthorize(hasPermi = "system:dept:query")
     @GetMapping(value = "/getById/{id}")
     public SysDept getById(@PathVariable("id") Long id)
     {
@@ -137,7 +137,7 @@ public class SysDeptController extends BaseController
     /**
      * 新增部门
      */
-    @PreAuthorize(hasPermi = "system:dept:add")
+//    @PreAuthorize(hasPermi = "system:dept:add")
     @Log(title = "部门管理", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@Validated @RequestBody SysDept dept)
@@ -153,7 +153,7 @@ public class SysDeptController extends BaseController
     /**
      * 修改部门
      */
-    @PreAuthorize(hasPermi = "system:dept:edit")
+//    @PreAuthorize(hasPermi = "system:dept:edit")
     @Log(title = "部门管理", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@Validated @RequestBody SysDept dept)
@@ -178,7 +178,7 @@ public class SysDeptController extends BaseController
     /**
      * 删除部门
      */
-    @PreAuthorize(hasPermi = "system:dept:remove")
+//    @PreAuthorize(hasPermi = "system:dept:remove")
     @Log(title = "部门管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{id}")
     public AjaxResult remove(@PathVariable Long id)

boman-modules/boman-system/src/main/java/com/boman/system/controller/SysUserController.java

@@ -56,7 +56,7 @@ public class SysUserController extends BaseController {
     /**
      * 获取用户列表
      */
-    @PreAuthorize(hasPermi = "system:user:list")
+//    @PreAuthorize(hasPermi = "system:user:list")
     @GetMapping("/list")
     public TableDataInfo list(SysUser user) {
         startPage();
@@ -65,7 +65,7 @@ public class SysUserController extends BaseController {
     }
 
     @Log(title = "用户管理", businessType = BusinessType.EXPORT)
-    @PreAuthorize(hasPermi = "system:user:export")
+//    @PreAuthorize(hasPermi = "system:user:export")
     @PostMapping("/export")
     public void export(HttpServletResponse response, SysUser user) throws IOException {
         List<SysUser> list = userService.selectUserList(user);
@@ -74,7 +74,7 @@ public class SysUserController extends BaseController {
     }
 
     @Log(title = "用户管理", businessType = BusinessType.IMPORT)
-    @PreAuthorize(hasPermi = "system:user:import")
+//    @PreAuthorize(hasPermi = "system:user:import")
     @PostMapping("/importData")
     public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception {
         ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
@@ -162,7 +162,7 @@ public class SysUserController extends BaseController {
     /**
      * 根据用户编号获取详细信息
      */
-    @PreAuthorize(hasPermi = "system:user:query")
+//    @PreAuthorize(hasPermi = "system:user:query")
     @GetMapping(value = {"/", "/{id}"})
     public AjaxResult getInfo(@PathVariable(value = "id", required = false) Long id) {
         AjaxResult ajax = AjaxResult.success();
@@ -180,7 +180,7 @@ public class SysUserController extends BaseController {
     /**
      * 新增用户
      */
-    @PreAuthorize(hasPermi = "system:user:add")
+//    @PreAuthorize(hasPermi = "system:user:add")
     @Log(title = "用户管理", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@Validated @RequestBody SysUser user) {
@@ -201,7 +201,7 @@ public class SysUserController extends BaseController {
     /**
      * 修改用户
      */
-    @PreAuthorize(hasPermi = "system:user:edit")
+//    @PreAuthorize(hasPermi = "system:user:edit")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@Validated @RequestBody SysUser user) {
@@ -220,7 +220,7 @@ public class SysUserController extends BaseController {
     /**
      * 删除用户
      */
-    @PreAuthorize(hasPermi = "system:user:remove")
+//    @PreAuthorize(hasPermi = "system:user:remove")
     @Log(title = "用户管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {
@@ -230,7 +230,7 @@ public class SysUserController extends BaseController {
     /**
      * 重置密码
      */
-    @PreAuthorize(hasPermi = "system:user:edit")
+//    @PreAuthorize(hasPermi = "system:user:edit")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping("/resetPwd")
     public AjaxResult resetPwd(@RequestBody SysUser user) {
@@ -243,7 +243,7 @@ public class SysUserController extends BaseController {
     /**
      * 状态修改
      */
-    @PreAuthorize(hasPermi = "system:user:edit")
+//    @PreAuthorize(hasPermi = "system:user:edit")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping("/changeStatus")
     public AjaxResult changeStatus(@RequestBody SysUser user) {

boman-modules/boman-system/src/main/java/com/boman/system/service/impl/SysMenuServiceImpl.java

@@ -428,7 +428,8 @@ public class SysMenuServiceImpl implements ISysMenuService {
      * @return 路由名称
      */
     public String getRouteName(SysMenu menu) {
-        String routerName = StringUtils.capitalize(menu.getPath());
+//        String routerName = StringUtils.capitalize(menu.getPath());
+        String routerName = menu.getPath();
         // 非外链并且是一级目录（类型为目录）
         if (isMeunFrame(menu)) {
             routerName = StringUtils.EMPTY;

boman-web-core/src/main/java/com/boman/web/core/domain/TableContext.java

@@ -122,7 +122,7 @@ public class TableContext {
                     // 新增
                     if (ActionType.INSERT.equals(context.getActionType())) {
                         // 新增可可见, 并且新增修改，把新增的字段单独拿出来
-                        if (INSERT_CAN_EDIT.equals(insertCanEdit) && INSERT_VISIBLE.equals(insertVisible)) {
+                        if (/*INSERT_CAN_EDIT.equals(insertCanEdit) &&*/ INSERT_VISIBLE.equals(insertVisible)) {
                             commitData.put(entry.getKey(), entry.getValue());
                         } else {
                             // 如果新增不可见，新增也不可以修改，但是你是外键的话或者是计算以后的值，就可以修改
@@ -132,7 +132,7 @@ public class TableContext {
                         }
                     } else {
                         // 编辑可见, 并且编辑可修改
-                        if (UPDATE_CAN_EDIT.equals(updateCanEdit) && UPDATE_VISIBLE.equals(updateVisible)) {
+                        if (/*UPDATE_CAN_EDIT.equals(updateCanEdit) &&*/ UPDATE_VISIBLE.equals(updateVisible)) {
                             commitData.put(entry.getKey(), entry.getValue());
                         } else {
                             // 如果编辑不可见，编辑也不可以修改，但是你是外键的话或者是计算以后的值，就可以修改

boman-web-core/src/main/java/com/boman/web/core/mapper/StandardMapper.java

@@ -77,7 +77,7 @@ public interface StandardMapper {
      * @param packColCondition packColCondition
      * @return int
      */
-    @SelectProvider(type = SqlProvider.class, method = "delete")
+    @SelectProvider(type = SqlProvider.class, method = "update")
     int update(@Param("tableName") String tableName, @Param("packCommitData") JSONObject packCommitData
             , @Param("packColCondition") JSONObject packColCondition);
 

boman-web-core/src/main/java/com/boman/web/core/service/update/BaseUpdateServiceImpl.java

@@ -80,7 +80,6 @@ public class BaseUpdateServiceImpl implements IBaseUpdateService {
         Timestamp currentTime = new Timestamp(System.currentTimeMillis());
 
         ColumnUtils.packUpdateByAndTime(columns, commitData, currentTime, false);
-        commitData = ifNullSetEmpty(escapeByQueryType(columns, commitData));
 
         JSONObject packColCondition = selectService.packColCondition(columns, condition);
         JSONObject packCommitData = selectService.packColCondition(columns, commitData);