部门，同步，单据类型修改

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

@@ -12,13 +12,16 @@ import com.glxp.api.constant.BusinessType;
 import com.glxp.api.controller.BaseController;
 import com.glxp.api.entity.auth.AuthAdmin;
 import com.glxp.api.entity.auth.DeptEntity;
+import com.glxp.api.entity.auth.DeptUserEntity;
 import com.glxp.api.entity.auth.InvWarehouseEntity;
 import com.glxp.api.entity.system.SystemParamConfigEntity;
+import com.glxp.api.req.auth.FilterDeptUserReqeust;
 import com.glxp.api.req.auth.FilterInvWarehouseRequest;
 import com.glxp.api.req.system.DeleteRequest;
 import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.service.auth.CustomerService;
 import com.glxp.api.service.auth.DeptService;
+import com.glxp.api.service.auth.DeptUserService;
 import com.glxp.api.service.auth.InvWarehouseService;
 import com.glxp.api.service.system.SystemParamConfigService;
 import org.springframework.validation.BindingResult;
@@ -82,7 +85,7 @@ public class DeptController extends BaseController {
         if (isHosUser()) {
             AuthAdmin authAdmin = customerService.getUserBean();
             filterInvWarehouseRequest.setUserId(authAdmin.getId());
-        }else {
+        } else {
 
         }
 
@@ -261,6 +264,9 @@ public class DeptController extends BaseController {
         return ResultVOUtils.success();
     }
 
+    @Resource
+    DeptUserService deptUserService;
+
     @AuthRuleAnnotation("")
     @PostMapping("/spms/inv/warehouse/delete")
     @Log(title = "用户管理", businessType = BusinessType.DELETE)
@@ -270,18 +276,19 @@ public class DeptController extends BaseController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
         }
 
-        //todo 代码未迁移完，后续记得修改
+        DeptEntity deptEntity = deptService.selectById(deleteRequest.getId());
+        List<InvWarehouseEntity> invSubWarehouseEntities = invWarehouseService.findByParentId(deptEntity.getCode());
+        if (CollUtil.isNotEmpty(invSubWarehouseEntities)) {
+            return ResultVOUtils.error(500, "删除失败，请先移除该部门关联仓库信息！");
+        }
+        FilterDeptUserReqeust filterDeptUserReqeust = new FilterDeptUserReqeust();
+        filterDeptUserReqeust.setDeptId(deptEntity.getId().longValue());
+        List<DeptUserEntity> deptUserEntities = deptUserService.selectDeptUser(filterDeptUserReqeust);
+        if (CollUtil.isNotEmpty(deptUserEntities)) {
+            return ResultVOUtils.error(500, "删除失败，请先移除该部门关联用户信息！");
+        }
+
 
-//        DeptEntity deptEntity = deptService.selectById(deleteRequest.getId());
-//        InvProductDetailEntity invProductDetailEntity = invProductDetailService.isExit(deptEntity.getCode());
-//        if (invProductDetailEntity != null) {
-//            return ResultVOUtils.error(500, "该仓库已有库存，不能删除！");
-//        }
-//
-//        List<InvSubWarehouseEntity> invSubWarehouseEntities = invSubWarehouseService.findByParentId(deptEntity.getCode());
-//        if (CollUtil.isNotEmpty(invSubWarehouseEntities)) {
-//            return ResultVOUtils.error(500, "删除失败，请先移除该部门关联仓库信息！");
-//        }
         boolean b = deptService.deleteById(deleteRequest.getId());
         if (!b) {
             return ResultVOUtils.error(ResultEnum.NOT_NETWORK);

src/main/java/com/glxp/api/dao/basic/BasicBussinessTypeDao.java

@@ -17,7 +17,6 @@ public interface BasicBussinessTypeDao extends BaseMapperPlus<BasicBussinessType
     /**
      * 查询单据类型列表
      *
-     * @param filterBussinessTypeRequest
      * @return
      */
     List<BasicBussinessTypeResponse> filterList(FilterBussinessTypeRequest filterBussinessTypeRequest);

src/main/java/com/glxp/api/task/AsyncSpsTask.java

@@ -36,7 +36,7 @@ public class AsyncSpsTask implements SchedulingConfigurer {
                     scheduledRequest.setCronName("syncIdcSps");
                     logger.info("syncIdcSps----------------");
                     ScheduledEntity scheduledEntity = scheduledDao.findScheduled(scheduledRequest);
-                    String cron = scheduledEntity != null ? scheduledEntity.getCron() : "0 0/59 * * * ?";
+                    String cron = scheduledEntity != null ? scheduledEntity.getCron() : "0 0/1 * * * ?";
 
                     if (cron.isEmpty()) {
                         logger.error("cron is null");

src/main/resources/mybatis/mapper/auth/DeptUserDao.xml

@@ -5,7 +5,6 @@
 <mapper namespace="com.glxp.api.dao.auth.DeptUserDao">
     <select id="selectDeptUser" parameterType="com.glxp.api.req.auth.FilterDeptUserReqeust"
             resultType="com.glxp.api.entity.auth.DeptUserEntity">
-        >
                 SELECT *
                 FROM auth_dept_user
         <where>