代码优化

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/PrivilegeDto.java

@@ -11,12 +11,11 @@ import java.util.List;
 public class PrivilegeDto {
 
     private String id;
-    private String schoolId;
     private String name;
     private String url;
     private PrivilegeEnum type;
     private Long parentId;
-    private Integer sortNumber;
+    private Integer sequence;
     private List<PrivilegeDto> children = new ArrayList<>();
 
     public String getId() {
@@ -27,14 +26,6 @@ public class PrivilegeDto {
         this.id = id;
     }
 
-    public String getSchoolId() {
-        return schoolId;
-    }
-
-    public void setSchoolId(String schoolId) {
-        this.schoolId = schoolId;
-    }
-
     public String getName() {
         return name;
     }
@@ -67,12 +58,12 @@ public class PrivilegeDto {
         this.parentId = parentId;
     }
 
-    public Integer getSortNumber() {
-        return sortNumber;
+    public Integer getSequence() {
+        return sequence;
     }
 
-    public void setSortNumber(Integer sortNumber) {
-        this.sortNumber = sortNumber;
+    public void setSequence(Integer sequence) {
+        this.sequence = sequence;
     }
 
     public List<PrivilegeDto> getChildren() {

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/SysPrivilegeServiceImpl.java

@@ -32,18 +32,17 @@ public class SysPrivilegeServiceImpl extends ServiceImpl<SysPrivilegeMapper, Sys
     @Override
     public List<PrivilegeDto> listOrgTree(Long schoolId) {
         QueryWrapper<SysPrivilege> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(SysPrivilege::getSchoolId, schoolId).orderByAsc(SysPrivilege::getParentId, SysPrivilege::getSortNumber);
+        queryWrapper.lambda().orderByAsc(SysPrivilege::getParentId, SysPrivilege::getSequence);
         List<SysPrivilege> orgList = this.list(queryWrapper);
         Map<Long, PrivilegeDto> map = new LinkedHashMap<>();
         for (SysPrivilege privilege : orgList) {
             PrivilegeDto privilegeDto = new PrivilegeDto();
             privilegeDto.setId(String.valueOf(privilege.getId()));
-            privilegeDto.setSchoolId(String.valueOf(privilege.getSchoolId()));
             privilegeDto.setName(privilege.getName());
             privilegeDto.setUrl(privilege.getUrl());
             privilegeDto.setType(privilege.getType());
             privilegeDto.setParentId(privilege.getParentId());
-            privilegeDto.setSortNumber(privilege.getSortNumber());
+            privilegeDto.setSequence(privilege.getSequence());
             map.put(privilege.getId(), privilegeDto);
         }
 
@@ -66,7 +65,7 @@ public class SysPrivilegeServiceImpl extends ServiceImpl<SysPrivilegeMapper, Sys
     @Override
     public boolean savePrivilege(SysPrivilege privilege) {
         QueryWrapper<SysPrivilege> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(SysPrivilege::getSchoolId, privilege.getSchoolId()).eq(SysPrivilege::getParentId, privilege.getParentId()).eq(SysPrivilege::getName, privilege.getName());
+        queryWrapper.lambda().eq(SysPrivilege::getParentId, privilege.getParentId()).eq(SysPrivilege::getName, privilege.getName());
         SysPrivilege sysPrivilege = this.getOne(queryWrapper);
 
         boolean isSuccess;
@@ -84,7 +83,6 @@ public class SysPrivilegeServiceImpl extends ServiceImpl<SysPrivilegeMapper, Sys
             if (sysPrivilege != null && privilege.getId() != sysPrivilege.getId()) {
                 throw ExceptionResultEnum.ERROR.exception("名称已存在");
             }
-            privilege.setUpdateTime(System.currentTimeMillis());
             isSuccess = this.updateById(privilege);
         }
 

distributed-print/src/main/java/com/qmth/distributed/print/api/SysPrivilegeController.java

@@ -61,9 +61,6 @@ public class SysPrivilegeController {
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     public Result save(HttpServletRequest request, @RequestBody SysPrivilege privilege) {
         ApiUser apiUser = RequestUtils.getApiUser(request);
-        privilege.setSchoolId(apiUser.getSchoolId());
-        privilege.setCreateId(privilege.getId() == null ? apiUser.getUserData().getId() : null);
-        privilege.setUpdateId(privilege.getId() != null ? apiUser.getUserData().getId() : null);
         boolean isSuccess = sysPrivilegeService.savePrivilege(privilege);
         return ResultUtil.ok(isSuccess);
     }