数据相关功能备份

api-admin/src/main/java/com/glxp/api/admin/controller/auth/DeptController.java

@@ -2,6 +2,9 @@ package com.glxp.api.admin.controller.auth;
 
 import com.github.pagehelper.PageInfo;
 import com.glxp.api.admin.annotation.AuthRuleAnnotation;
+import com.glxp.api.admin.annotation.Log;
+import com.glxp.api.admin.constant.BusinessType;
+import com.glxp.api.admin.controller.BaseController;
 import com.glxp.api.admin.entity.auth.DeptEntity;
 import com.glxp.api.admin.req.auth.FilterDeptRequest;
 import com.glxp.api.admin.req.inout.DeleteRequest;
@@ -20,7 +23,7 @@ import java.util.Date;
 import java.util.List;
 
 @RestController
-public class DeptController {
+public class DeptController extends BaseController {
 
 
     @Resource
@@ -39,38 +42,52 @@ public class DeptController {
         return ResultVOUtils.success(deptEntityPageSimpleResponse);
     }
 
+
+    @AuthRuleAnnotation("")
+    @GetMapping("udi/auth/dept/getDept")
+    public BaseResponse getDept(FilterDeptRequest filterDeptRequest) {
+        DeptEntity deptEntity = deptService.selectById(filterDeptRequest.getId());
+        return ResultVOUtils.success(deptEntity);
+    }
+
     @AuthRuleAnnotation("")
+    @Log(title = "部门管理", businessType = BusinessType.INSERT)
     @PostMapping("udi/auth/dept/add")
     public BaseResponse addDept(@RequestBody DeptEntity deptEntity) {
         deptEntity.setCode(gennerOrderUtils.getDeptCode());
+        deptEntity.setCreateTime(new Date());
         deptEntity.setUpdateTime(new Date());
+        deptEntity.setCreateBy(getUser().getUserName());
         boolean b = deptService.insertDept(deptEntity);
         if (b)
             return ResultVOUtils.success("添加成功");
         else {
             return ResultVOUtils.error(500, "添加失败");
         }
-
     }
 
+    @Log(title = "部门管理", businessType = BusinessType.UPDATE)
     @AuthRuleAnnotation("")
     @PostMapping("udi/auth/dept/update")
     public BaseResponse updateDept(@RequestBody DeptEntity deptEntity) {
+        deptEntity.setUpdateBy(getUser().getUserName());
         deptEntity.setUpdateTime(new Date());
         boolean b = deptService.updateDept(deptEntity);
-
         if (b)
             return ResultVOUtils.success("更新成功！");
         else {
-            return ResultVOUtils.error(500, "更新成功!");
+            return ResultVOUtils.error(500, "更新失败!");
         }
 
     }
 
-
+    @Log(title = "部门管理", businessType = BusinessType.DELETE)
     @AuthRuleAnnotation("")
     @PostMapping("udi/auth/dept/delete")
     public BaseResponse deleteDept(@RequestBody DeleteRequest deleteRequest) {
+        if (deptService.filterSubDepts(Integer.parseInt(deleteRequest.getId())).size() > 0) {
+            return ResultVOUtils.error(500, "删除失败，存在子级部门，请先移除！");
+        }
         boolean b = deptService.deleteById(Integer.parseInt(deleteRequest.getId()));
         if (b)
             return ResultVOUtils.success("删除成功");

api-admin/src/main/java/com/glxp/api/admin/controller/auth/SysHisStatusController.java

@@ -0,0 +1,107 @@
+package com.glxp.api.admin.controller.auth;
+
+import com.github.pagehelper.PageInfo;
+import com.glxp.api.admin.annotation.AuthRuleAnnotation;
+import com.glxp.api.admin.annotation.Log;
+import com.glxp.api.admin.constant.BusinessType;
+import com.glxp.api.admin.controller.BaseController;
+import com.glxp.api.admin.entity.auth.SysHisStatusEntity;
+import com.glxp.api.admin.req.auth.FilterSysHisStatusRequest;
+import com.glxp.api.admin.req.inout.DeleteRequest;
+import com.glxp.api.admin.res.PageSimpleResponse;
+import com.glxp.api.admin.service.auth.ISysHisStatusService;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+public class SysHisStatusController extends BaseController {
+
+    @Resource
+    ISysHisStatusService sysHisStatusService;
+
+
+    @AuthRuleAnnotation("")
+    @GetMapping("/sys/his/stauts/filter")
+    public BaseResponse filterList(FilterSysHisStatusRequest filterSysHisStatusRequest) {
+        List<SysHisStatusEntity> selectList = sysHisStatusService.selectList(filterSysHisStatusRequest);
+        PageInfo<SysHisStatusEntity> pageInfo = new PageInfo<>(selectList);
+        PageSimpleResponse<SysHisStatusEntity> deptEntityPageSimpleResponse = new PageSimpleResponse<>();
+        deptEntityPageSimpleResponse.setTotal(pageInfo.getTotal());
+        deptEntityPageSimpleResponse.setList(selectList);
+        return ResultVOUtils.success(deptEntityPageSimpleResponse);
+    }
+
+    //获取数据权限列表树形列表
+    @AuthRuleAnnotation("")
+    @GetMapping("/sys/his/stauts/tree")
+    public BaseResponse treeList(FilterSysHisStatusRequest filterSysHisStatusRequest) {
+        List<SysHisStatusEntity> selectList = sysHisStatusService.selectList(filterSysHisStatusRequest);
+        return ResultVOUtils.success(sysHisStatusService.buildStatusTreeSelect(selectList));
+    }
+
+    //获取数据权限包含已经选中树形列表
+    @AuthRuleAnnotation("")
+    @GetMapping("/sys/his/stauts/treeSelect")
+    public BaseResponse treeSelectedList(FilterSysHisStatusRequest filterSysHisStatusRequest) {
+        List<SysHisStatusEntity> menus = sysHisStatusService.selectList(filterSysHisStatusRequest);
+        Map<String, Object> ajax = new HashMap<>();
+        ajax.put("checkedKeys", sysHisStatusService.selectListByDeptId(filterSysHisStatusRequest.getDeptId()));
+        ajax.put("menus", sysHisStatusService.buildStatusTreeSelect(menus));
+        return ResultVOUtils.success(ajax);
+    }
+
+
+    @AuthRuleAnnotation("")
+    @Log(title = "数据状态", businessType = BusinessType.INSERT)
+    @PostMapping("sys/his/stauts/add")
+    public BaseResponse addStatus(@RequestBody SysHisStatusEntity sysHisStatusEntity) {
+        sysHisStatusEntity.setUpdateTime(new Date());
+        boolean b = sysHisStatusService.insert(sysHisStatusEntity);
+        if (b)
+            return ResultVOUtils.success("添加成功");
+        else {
+            return ResultVOUtils.error(500, "添加失败");
+        }
+    }
+
+    @Log(title = "数据状态", businessType = BusinessType.UPDATE)
+    @AuthRuleAnnotation("")
+    @PostMapping("sys/his/stauts/update")
+    public BaseResponse updateStatus(@RequestBody SysHisStatusEntity sysHisStatusEntity) {
+        sysHisStatusEntity.setUpdateTime(new Date());
+        boolean b = sysHisStatusService.update(sysHisStatusEntity);
+        if (b)
+            return ResultVOUtils.success("更新成功！");
+        else {
+            return ResultVOUtils.error(500, "更新失败!");
+        }
+    }
+
+
+    @Log(title = "数据状态", businessType = BusinessType.DELETE)
+    @AuthRuleAnnotation("")
+    @PostMapping("sys/his/stauts/delete")
+    public BaseResponse deleteStatus(@RequestBody DeleteRequest deleteRequest) {
+//        if (deptService.filterSubDepts(Integer.parseInt(deleteRequest.getId())).size() > 0) {
+//            return ResultVOUtils.error(500, "删除失败，存在子级部门，请先移除！");
+//        }
+        boolean b = sysHisStatusService.deleteById(Integer.parseInt(deleteRequest.getId()));
+        if (b)
+            return ResultVOUtils.success("删除成功");
+        else {
+            return ResultVOUtils.error(500, "删除失败");
+        }
+    }
+
+
+}

api-admin/src/main/java/com/glxp/api/admin/controller/auth/SysRoleController.java

@@ -12,7 +12,6 @@ import com.glxp.api.admin.req.auth.SysRoleRequest;
 import com.glxp.api.admin.res.PageSimpleResponse;
 import com.glxp.api.admin.service.auth.AuthAdminService;
 import com.glxp.api.admin.service.auth.ISysRoleService;
-import com.glxp.api.admin.service.auth.SysPermissionService;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
 import lombok.RequiredArgsConstructor;
@@ -32,8 +31,6 @@ public class SysRoleController extends BaseController {
     ISysRoleService roleService;
     @Resource
     AuthAdminService userService;
-    @Resource
-    SysPermissionService permissionService;
 
     /**
      * 获取角色信息列表

api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java

@@ -749,7 +749,7 @@ public class WareHouseController {
             if (addOrderRequest.isVailInv()) {
                 if (bussinessTypeEntity.isAdvanceType()) {
                     int count = invPreProductDetailService.vailStockCount(code);
-                    if (count < 0) {
+                    if (count <= 0) {
                         return ResultVOUtils.error(500, "当前库存不足，不允许0库存出库");
                     }
                 } else {
@@ -1376,12 +1376,12 @@ public class WareHouseController {
         if (null == id)
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
         WarehouseBussinessTypeEntity warehouseBussinessTypeEntity = warehouseBussinessTypeService.selectById(id);
-        FilterInvBusUserRequest filterInvBusUserRequest=new FilterInvBusUserRequest();
+        FilterInvBusUserRequest filterInvBusUserRequest = new FilterInvBusUserRequest();
         filterInvBusUserRequest.setScAction(warehouseBussinessTypeEntity.getAction());
         filterInvBusUserRequest.setSubInvCode(warehouseBussinessTypeEntity.getCode());
-        List<InvBusUserEntity> invBusUserEntityList=invBusUserService.filterInvBusUser(filterInvBusUserRequest);
+        List<InvBusUserEntity> invBusUserEntityList = invBusUserService.filterInvBusUser(filterInvBusUserRequest);
-        if(invBusUserEntityList.size()>0){
+        if (invBusUserEntityList.size() > 0) {
-            return  ResultVOUtils.error(999,"有用户关联该单据请先移除再进行删除！");
+            return ResultVOUtils.error(999, "有用户关联该单据请先移除再进行删除！");
         }
 
         InvSubWarehouseEntity invSubWarehouseEntity =

api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvWarehouseController.java

@@ -12,7 +12,6 @@ import com.glxp.api.admin.constant.BasicProcessStatus;
 import com.glxp.api.admin.entity.auth.AuthAdmin;
 import com.glxp.api.admin.entity.basic.BasicExportStatusEntity;
 import com.glxp.api.admin.entity.info.SystemParamConfigEntity;
-import com.glxp.api.admin.entity.inout.WarehouseBussinessTypeEntity;
 import com.glxp.api.admin.entity.inventory.InvProductDetailEntity;
 import com.glxp.api.admin.entity.inventory.InvSubWarehouseEntity;
 import com.glxp.api.admin.entity.inventory.InvWarehouseEntity;
@@ -29,9 +28,7 @@ import com.glxp.api.admin.res.inventory.InvWarehouseResponse;
 import com.glxp.api.admin.res.inventory.InvWarehouseThirdSysResponse;
 import com.glxp.api.admin.service.auth.CustomerService;
 import com.glxp.api.admin.service.basic.BasicExportService;
-import com.glxp.api.admin.service.basic.BussinessTypeService;
 import com.glxp.api.admin.service.info.SystemParamConfigService;
-import com.glxp.api.admin.service.inout.WarehouseBussinessTypeService;
 import com.glxp.api.admin.service.inventory.InvProductDetailService;
 import com.glxp.api.admin.service.inventory.InvSubWarehouseService;
 import com.glxp.api.admin.service.inventory.InvWarehouseService;
@@ -229,8 +226,6 @@ public class InvWarehouseController {
             }
         }
 
-
-
         if (invWarehouseEntity.getPid() == null || invWarehouseEntity.getPid() == 0) {//仓库
             invWarehouseEntity.setPid(0); // 默认设置
             FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest();

api-admin/src/main/java/com/glxp/api/admin/controller/monitor/SysOperlogController.java

@@ -32,7 +32,7 @@ public class SysOperlogController extends BaseController {
     /**
      * 获取操作日志记录列表
      */
-    @Log(title = "操作日志", businessType = BusinessType.OTHER)
+//    @Log(title = "操作日志", businessType = BusinessType.OTHER)
     @SaCheckPermission("monitor:operlog:list")
     @GetMapping("/list")
     public BaseResponse list(SysOperLogRequest sysOperLogRequest) {

api-admin/src/main/java/com/glxp/api/admin/dao/auth/DeptHisStatusDao.java

@@ -0,0 +1,23 @@
+package com.glxp.api.admin.dao.auth;
+
+import com.glxp.api.admin.entity.auth.DeptHisStatusEntity;
+import com.glxp.api.admin.req.auth.SysRoleMenuRequest;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface DeptHisStatusDao {
+
+
+    List<DeptHisStatusEntity> selectDeptHisStatus(SysRoleMenuRequest sysRoleMenu);
+
+    int deleteById(Integer id);
+
+
+    int deleteByList(@Param("ids") List<Integer> ids);
+
+    int insertBatch(List<DeptHisStatusEntity> list);
+
+}

api-admin/src/main/java/com/glxp/api/admin/dao/auth/SysHisStatusDao.java

@@ -0,0 +1,22 @@
+package com.glxp.api.admin.dao.auth;
+
+import com.glxp.api.admin.entity.auth.SysHisStatusEntity;
+import com.glxp.api.admin.req.auth.FilterSysHisStatusRequest;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface SysHisStatusDao {
+
+    List<SysHisStatusEntity> selectList(FilterSysHisStatusRequest filterSysHisStatusRequest);
+
+    boolean insert(SysHisStatusEntity sysHisStatusEntity);
+
+    boolean deleteById(Integer id);
+
+    boolean update(SysHisStatusEntity sysHisStatusEntity);
+
+    List<Integer> selectListByDeptId(@Param("deptId") Integer deptId);
+}

api-admin/src/main/java/com/glxp/api/admin/dao/auth/SysRoleMenuMapper.java

@@ -13,10 +13,8 @@ public interface SysRoleMenuMapper {
 
     List<SysRoleMenu> selectRoleMenuList(SysRoleMenuRequest sysRoleMenu);
 
-
     int deleteById(Long id);
 
-
     int deleteByList(@Param("ids") List<Long> ids);
 
     int insertBatch(List<SysRoleMenu> list);

api-admin/src/main/java/com/glxp/api/admin/entity/auth/DeptEntity.java

@@ -1,16 +1,22 @@
 package com.glxp.api.admin.entity.auth;
 
+import com.glxp.api.admin.entity.BaseEntity;
 import lombok.Data;
+import org.apache.poi.ss.formula.functions.T;
 
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 @Data
-public class DeptEntity {
+public class DeptEntity extends BaseEntity {
     private String code;
     private Integer id;
     private String name;
-    private String parentId;
+    private Integer parentId;
     private String remark;
     private Integer flag;
     private Date updateTime;
+    private List<T> children = new ArrayList<>();
+    List<Integer> statusIds;
 }

api-admin/src/main/java/com/glxp/api/admin/entity/auth/DeptHisStatusEntity.java

@@ -0,0 +1,11 @@
+package com.glxp.api.admin.entity.auth;
+
+import lombok.Data;
+
+@Data
+public class DeptHisStatusEntity {
+
+    private Integer deptId;
+    private Integer statusId;
+
+}

api-admin/src/main/java/com/glxp/api/admin/entity/auth/SysHisStatusEntity.java

@@ -0,0 +1,19 @@
+package com.glxp.api.admin.entity.auth;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class SysHisStatusEntity {
+
+    private Integer id;
+    private String type;
+    private String typeName;
+    private Integer parentId;
+    private Integer status;
+    private String remark;
+    private Date updateTime;
+    private String parentName;
+
+}

api-admin/src/main/java/com/glxp/api/admin/req/auth/DeptHisStatusRequest.java

@@ -0,0 +1,12 @@
+package com.glxp.api.admin.req.auth;
+
+import com.glxp.api.admin.req.ListPageRequest;
+import lombok.Data;
+
+@Data
+public class DeptHisStatusRequest extends ListPageRequest {
+
+    private Integer deptId;
+    private Integer statusId;
+
+}

api-admin/src/main/java/com/glxp/api/admin/req/auth/FilterDeptRequest.java

@@ -9,6 +9,7 @@ public class FilterDeptRequest extends ListPageRequest {
     private String name;
     private Integer flag;
     private String lastUpdateTime;
-    private String parentId;
+    private Integer parentId;
+    private Integer id;
 
 }

api-admin/src/main/java/com/glxp/api/admin/req/auth/FilterSysHisStatusRequest.java

@@ -0,0 +1,18 @@
+package com.glxp.api.admin.req.auth;
+
+import com.glxp.api.admin.req.ListPageRequest;
+import lombok.Data;
+
+@Data
+public class FilterSysHisStatusRequest extends ListPageRequest {
+
+    private Integer id;
+    private String type;
+    private String typeName;
+    private Integer parentId;
+    private Integer status;
+
+
+    private Integer deptId;
+
+}

api-admin/src/main/java/com/glxp/api/admin/service/auth/DeptService.java

@@ -9,6 +9,10 @@ import java.util.List;
 public interface DeptService {
 
 
+    List<DeptEntity> filterSubDepts(Integer id);
+
+    DeptEntity selectById(Integer id);
+
     List<DeptEntity> filterDepts(FilterDeptRequest filterDeptRequest);
 
     boolean insertDept(DeptEntity deptEntity);
@@ -17,7 +21,6 @@ public interface DeptService {
 
     boolean deleteById(Integer id);
 
-
     boolean deleteAll();
 
 }

api-admin/src/main/java/com/glxp/api/admin/service/auth/ISysHisStatusService.java

@@ -0,0 +1,23 @@
+package com.glxp.api.admin.service.auth;
+
+import cn.hutool.core.lang.tree.Tree;
+import com.glxp.api.admin.entity.auth.SysHisStatusEntity;
+import com.glxp.api.admin.req.auth.FilterSysHisStatusRequest;
+
+import java.util.List;
+
+public interface ISysHisStatusService {
+
+
+    List<SysHisStatusEntity> selectList(FilterSysHisStatusRequest filterSysHisStatusRequest);
+
+    boolean insert(SysHisStatusEntity sysHisStatusEntity);
+
+    boolean deleteById(Integer id);
+
+    boolean update(SysHisStatusEntity sysHisStatusEntity);
+
+    List<Integer> selectListByDeptId(Integer deptId);
+
+    List<Tree<Integer>> buildStatusTreeSelect(List<SysHisStatusEntity> sysHisStatusEntities);
+}

api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/DeptServiceImpl.java

@@ -1,19 +1,43 @@
 package com.glxp.api.admin.service.auth.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import com.github.pagehelper.PageHelper;
 import com.glxp.api.admin.dao.auth.DeptDao;
+import com.glxp.api.admin.dao.auth.DeptHisStatusDao;
 import com.glxp.api.admin.entity.auth.DeptEntity;
+import com.glxp.api.admin.entity.auth.DeptHisStatusEntity;
 import com.glxp.api.admin.req.auth.FilterDeptRequest;
 import com.glxp.api.admin.service.auth.DeptService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 
 @Service
 public class DeptServiceImpl implements DeptService {
     @Resource
     DeptDao deptDao;
+    @Resource
+    DeptHisStatusDao deptHisStatusDao;
+
+    @Override
+    public List<DeptEntity> filterSubDepts(Integer id) {
+
+        FilterDeptRequest filterDeptRequest = new FilterDeptRequest();
+        filterDeptRequest.setParentId(id);
+        return deptDao.filterDepts(filterDeptRequest);
+    }
+
+    @Override
+    public DeptEntity selectById(Integer id) {
+        FilterDeptRequest filterDeptRequest = new FilterDeptRequest();
+        filterDeptRequest.setId(id);
+        List<DeptEntity> deptEntityList = deptDao.filterDepts(filterDeptRequest);
+        if (CollUtil.isNotEmpty(deptEntityList))
+            return deptEntityList.get(0);
+        return null;
+    }
 
     @Override
     public List<DeptEntity> filterDepts(FilterDeptRequest filterDeptRequest) {
@@ -26,12 +50,32 @@ public class DeptServiceImpl implements DeptService {
 
     @Override
     public boolean insertDept(DeptEntity deptEntity) {
-        return deptDao.insertDept(deptEntity);
+        deptDao.insertDept(deptEntity);
+        insertDeptHisStatus(deptEntity);
+        return true;
     }
 
     @Override
     public boolean updateDept(DeptEntity deptEntity) {
-        return deptDao.updateDept(deptEntity);
+
+        deptHisStatusDao.deleteById(deptEntity.getId());
+        deptDao.updateDept(deptEntity);
+        insertDeptHisStatus(deptEntity);
+        return true;
+    }
+
+    public void insertDeptHisStatus(DeptEntity deptEntity) {
+        List<DeptHisStatusEntity> list = new ArrayList<DeptHisStatusEntity>();
+        for (Integer statusId : deptEntity.getStatusIds()) {
+            DeptHisStatusEntity deptHisStatusEntity = new DeptHisStatusEntity();
+            deptHisStatusEntity.setDeptId(deptEntity.getId());
+            deptHisStatusEntity.setStatusId(statusId);
+            list.add(deptHisStatusEntity);
+        }
+        if (CollUtil.isNotEmpty(list)) {
+            deptHisStatusDao.insertBatch(list);
+        }
+
     }
 
     @Override

api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/ISysHisStatusServiceImpl.java

@@ -0,0 +1,63 @@
+package com.glxp.api.admin.service.auth.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.lang.tree.Tree;
+import com.github.pagehelper.PageHelper;
+import com.glxp.api.admin.dao.auth.SysHisStatusDao;
+import com.glxp.api.admin.entity.auth.SysHisStatusEntity;
+import com.glxp.api.admin.req.auth.FilterSysHisStatusRequest;
+import com.glxp.api.admin.service.auth.ISysHisStatusService;
+import com.glxp.api.admin.util.TreeBuildUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service
+public class ISysHisStatusServiceImpl implements ISysHisStatusService {
+
+    @Resource
+    SysHisStatusDao sysHisStatusDao;
+
+    @Override
+    public List<SysHisStatusEntity> selectList(FilterSysHisStatusRequest filterSysHisStatusRequest) {
+
+        if (filterSysHisStatusRequest.getPage() != null) {
+            int offset = (filterSysHisStatusRequest.getPage() - 1) * filterSysHisStatusRequest.getLimit();
+            PageHelper.offsetPage(offset, filterSysHisStatusRequest.getLimit());
+        }
+        return sysHisStatusDao.selectList(filterSysHisStatusRequest);
+    }
+
+    @Override
+    public boolean insert(SysHisStatusEntity sysHisStatusEntity) {
+        return sysHisStatusDao.insert(sysHisStatusEntity);
+    }
+
+    @Override
+    public boolean deleteById(Integer id) {
+        return sysHisStatusDao.deleteById(id);
+    }
+
+    @Override
+    public boolean update(SysHisStatusEntity sysHisStatusEntity) {
+        return sysHisStatusDao.update(sysHisStatusEntity);
+    }
+
+    @Override
+    public List<Integer> selectListByDeptId(Integer roleId) {
+        return sysHisStatusDao.selectListByDeptId(roleId);
+    }
+
+    @Override
+    public List<Tree<Integer>> buildStatusTreeSelect(List<SysHisStatusEntity> sysHisStatusEntities) {
+        if (CollUtil.isEmpty(sysHisStatusEntities)) {
+            return CollUtil.newArrayList();
+        }
+        return TreeBuildUtils.build(sysHisStatusEntities, (menu, tree) ->
+                tree.setId(menu.getId())
+                        .setParentId(menu.getParentId())
+                        .setName(menu.getTypeName())
+                        .setWeight(menu.getId()));
+    }
+}

api-admin/src/main/java/com/glxp/api/admin/util/JwtUtils.java

@@ -86,7 +86,7 @@ public class JwtUtils {
                     .setSigningKey(generateKey())     //此处的key要与之前创建的key一致
                     .parseClaimsJws(jwt)
                     .getBody();
-        }catch (ExpiredJwtException e){
+        }catch (Exception e){
             return null;
         }
     }

api-admin/src/main/resources/mybatis/mapper/auth/DeptDao.xml

@@ -8,7 +8,10 @@
         SELECT *
         FROM auth_dept
         <where>
-            <if test="flag != null and flag != ''">
+            <if test="id != null ">
+                and id = #{id}
+            </if>
+            <if test="flag != null ">
                 and flag = #{flag}
             </if>
             <if test="parentId != null and parentId != ''">

api-admin/src/main/resources/mybatis/mapper/auth/DeptHisStatusDao.xml

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.glxp.api.admin.dao.auth.DeptHisStatusDao">
+
+
+    <select id="selectDeptHisStatus" parameterType="com.glxp.api.admin.req.auth.SysRoleMenuRequest"
+            resultType="com.glxp.api.admin.entity.auth.DeptHisStatusEntity">>
+        SELECT *
+        FROM auth_dept_status
+        <where>
+            <if test="deptId != null ">
+                and deptId = #{deptId}
+            </if>
+            <if test="statusId != null ">
+                and statusId = #{statusId}
+            </if>
+        </where>
+    </select>
+
+    <delete id="deleteById" parameterType="java.lang.Integer">
+        delete
+        from auth_dept_status
+        where deptId = #{id}
+    </delete>
+
+    <delete id="deleteByList" parameterType="java.util.List"
+    >
+        delete
+        from auth_dept_status
+        where deptId in
+        <foreach item="item" index="index" collection="ids" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+
+    </delete>
+
+
+    <insert id="insertBatch" keyProperty="id" parameterType="java.util.List">
+        insert INTO auth_dept_status
+        (
+        deptId,statusId
+        )
+        values
+        <foreach collection="list" item="item" index="index"
+                 separator=",">
+            (
+            #{item.deptId},
+            #{item.statusId}
+            )
+        </foreach>
+    </insert>
+
+</mapper>

api-admin/src/main/resources/mybatis/mapper/auth/SysHisStatusDao.xml

@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+
+<mapper namespace="com.glxp.api.admin.dao.auth.SysHisStatusDao">
+
+    <select id="selectList" parameterType="com.glxp.api.admin.req.auth.FilterSysHisStatusRequest"
+            resultType="com.glxp.api.admin.entity.auth.SysHisStatusEntity">
+        select A.*,B.typeName parentName from sys_his_status A left JOIN sys_his_status B on A.parentId = B.id
+        <where>
+            <if test="id != null ">
+                and A.id = #{id}
+            </if>
+            <if test=" parentId != null">
+                and A.parentId = #{parentId}
+            </if>
+            <if test="typeName != null and '' != typeName">
+                AND A.`typeName` LIKE CONCAT('%',#{typeName},'%')
+            </if>
+            <if test="type != null and '' != type">
+                AND A.`type` LIKE CONCAT('%',#{type},'%')
+            </if>
+        </where>
+    </select>
+
+
+    <insert id="insert" keyProperty="id" parameterType="com.glxp.api.admin.entity.auth.DeptEntity">
+        INSERT INTO sys_his_status(`type`, `typeName`, `parentId`, status, remark, updateTime)
+        values (#{type},
+                #{typeName},
+                #{parentId}, #{status}, #{remark}, #{updateTime})
+    </insert>
+
+    <update id="update" parameterType="com.glxp.api.admin.entity.auth.DeptEntity">
+        UPDATE sys_his_status
+        <trim prefix="set" suffixOverrides=",">
+            <if test="type != null">`type`=#{type},</if>
+            <if test="typeName != null">`typeName`=#{typeName},</if>
+            <if test="parentId != null">parentId=#{parentId},</if>
+            <if test="status != null">status=#{status},</if>
+            <if test="updateTime != null">updateTime=#{updateTime},</if>
+            <if test="remark != null">remark=#{remark},</if>
+        </trim>
+        WHERE id=#{id}
+    </update>
+
+    <delete id="deleteById" parameterType="java.lang.Integer">
+        delete
+        from sys_his_status
+        where id = #{id}
+    </delete>
+
+
+    <select id="selectListByDeptId" resultType="java.lang.Integer">
+        select id
+        from sys_his_status
+                 left join auth_dept_status on sys_his_status.id = auth_dept_status.statusId
+        where auth_dept_status.deptId = #{deptId}
+          and sys_his_status.id not in
+              (select parentId
+               from sys_his_status
+                        INNER JOIN auth_dept_status
+                                   on sys_his_status.id = auth_dept_status.statusId
+                                       and auth_dept_status.deptId = #{deptId})
+
+
+    </select>
+
+</mapper>

api-admin/src/main/resources/mybatis/mapper/auth/SysMenuDao.xml

@@ -90,14 +90,12 @@
 
     <select id="selectMenuList" parameterType="com.glxp.api.admin.req.auth.SysMenuRequest"
             resultMap="SysMenuResult">
-
         select *
         FROM sys_menu
         <where>
             <if test="menuId != null ">
                 and menu_id = #{menuId}
             </if>
-
             <if test="menuName != null and menuName != '' ">
                 AND menu_name LIKE CONCAT('%',#{menuName},'%')
             </if>

api-admin/src/main/resources/mybatis/mapper/schedule/SystemParamConfigDao.xml

@@ -10,11 +10,15 @@
         <where>
             AND `paramStatus` = #{paramStatus}
             <if test="paramName != null and '' != paramName">
-                AND `paramName` LIKE CONCAT(#{paramName},'%')
+                AND `paramName` LIKE CONCAT('%',#{paramName},'%')
             </if>
             <if test="paramType!=null">
                 and paramType = #{paramType}
             </if>
+            <if test="key!=null and ''!=key">
+                and (`paramName` like CONCAT('%',#{key},'%') or `paramType` like CONCAT('%',#{key},'%'))
+            </if>
+
         </where>
         order BY id
     </select>
@@ -30,7 +34,9 @@
 
     <select id="selectByParamName" parameterType="com.glxp.api.admin.req.info.SystemParamConfigRequest"
             resultType="com.glxp.api.admin.entity.info.SystemParamConfigEntity">
-        SELECT * FROM sys_param_config  WHERE paramName=#{paramName}
+        SELECT *
+        FROM sys_param_config
+        WHERE paramName = #{paramName}
     </select>
 
     <select id="selectByParamKey" parameterType="com.glxp.api.admin.req.info.SystemParamConfigRequest"

api-admin/src/main/resources/schemas/schema_v2.1.sql

@@ -5,7 +5,7 @@ CALL Pro_Temp_ColumnWork ('io_order','wzUploadStatus','varchar(255) ', 1);
 CALL Pro_Temp_ColumnWork ('io_order','wzUploadResult','varchar(255) ', 1);
 
 
-CALL Pro_Temp_ColumnWork ('auth_dept','parentId','varchar(255) ', 1);
+CALL Pro_Temp_ColumnWork ('auth_dept','parentId','int ', 1);
 
 
 -- 创建表时必须  create table if not exists 表名