From 6d52ad21cf92c87331e0236a9c6c2fbb1bd287c6 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Fri, 28 Apr 2023 21:26:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/thrsys/ThrDeptController.java  | 12 +++----
 .../com/glxp/api/dao/auth/InvSpaceDao.java    |  4 +--
 .../com/glxp/api/entity/auth/InvSpace.java    |  3 ++
 .../auth/impl/InvSpaceServiceImpl.java        | 10 +++---
 .../auth/impl/InvWarehouseServiceImpl.java    |  2 +-
 .../api/service/thrsys/ThrDeptService.java    |  3 ++
 .../thrsys/impl/ThrDeptServiceImpl.java       |  6 ++++
 src/main/resources/application.yml            |  2 +-
 .../mybatis/mapper/auth/DeptUserDao.xml       |  3 +-
 .../mybatis/mapper/auth/InvSpaceDao.xml       | 14 +-------
 .../mybatis/mapper/auth/InvWarehouseDao.xml   | 35 ++++++++++++-------
 src/main/resources/schemas/schema_v2.1.sql    |  6 ++++
 12 files changed, 58 insertions(+), 42 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrDeptController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrDeptController.java
index b4c8c139..1f89f366 100644
--- a/src/main/java/com/glxp/api/controller/thrsys/ThrDeptController.java
+++ b/src/main/java/com/glxp/api/controller/thrsys/ThrDeptController.java
@@ -91,9 +91,10 @@ public class ThrDeptController {
         return ResultVOUtils.success("添加成功！");
     }
 
+
     @PostMapping("/spms/thrsys/warehouse/edit")
     public BaseResponse edit(@RequestBody @Valid ThrDeptEntity thrDeptEntity,
-                             BindingResult bindingResult,FilterThrSubInvWarehouseRequest filterThrSubInvWarehouseRequest,FilterThrDeptRequest filterThrDeptRequest) {
+                             BindingResult bindingResult, FilterThrSubInvWarehouseRequest filterThrSubInvWarehouseRequest, FilterThrDeptRequest filterThrDeptRequest) {
 
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
@@ -111,13 +112,12 @@ public class ThrDeptController {
             //修改仓库
             thrInvWarehouseService.updateThrInvWarehouse(thrInvWarehouseEntity);
         }
-            //判断部门是否存在
+        //判断部门是否存在
         filterThrDeptRequest.setCode(thrDeptEntity.getCode());
         filterThrDeptRequest.setName(thrDeptEntity.getName());
         filterThrDeptRequest.setThirdSysFk(thrDeptEntity.getThirdSysFk());
         filterThrDeptRequest.setStatus(thrDeptEntity.getStatus());
-        List<ThrDeptEntity> thrDeptEntities = thrDeptService.filterThrInvWarehouse(filterThrDeptRequest);
-        if(thrDeptEntities.size()==0 ){
+        if (!thrDeptService.editExit(thrDeptEntity.getCode(), thrDeptEntity.getCode(), thrDeptEntity.getId())) {
             thrDeptEntity.setPid(null); // 不能修改父级 pid
             thrDeptEntity.setUpdateTime(new Date());
             boolean b = thrDeptService.updateInvWarehouse(thrDeptEntity);
@@ -125,7 +125,7 @@ public class ThrDeptController {
                 return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
             }
             return ResultVOUtils.success();
-        }else{
+        } else {
             return ResultVOUtils.error(ResultEnum.DATA_REPEAT);
         }
 
@@ -162,7 +162,7 @@ public class ThrDeptController {
 //        }
 //        filterThrSubInvWarehouseRequest.setParentId((String) thirdId);
         filterThrSubInvWarehouseRequest.setStatus(0);
-         List<ThrInvWarehouseEntity> thrInvWarehouseEntities = thrInvWarehouseService.selectByThrDeptCode(filterThrSubInvWarehouseRequest);
+        List<ThrInvWarehouseEntity> thrInvWarehouseEntities = thrInvWarehouseService.selectByThrDeptCode(filterThrSubInvWarehouseRequest);
         PageInfo<ThrInvWarehouseEntity> pageInfo;
         pageInfo = new PageInfo<>(thrInvWarehouseEntities);
         PageSimpleResponse<ThrInvWarehouseEntity> pageSimpleResponse = new PageSimpleResponse<>();
diff --git a/src/main/java/com/glxp/api/dao/auth/InvSpaceDao.java b/src/main/java/com/glxp/api/dao/auth/InvSpaceDao.java
index d7764ac3..99492b76 100644
--- a/src/main/java/com/glxp/api/dao/auth/InvSpaceDao.java
+++ b/src/main/java/com/glxp/api/dao/auth/InvSpaceDao.java
@@ -12,13 +12,11 @@ import java.util.List;
 @Mapper
 public interface InvSpaceDao extends BaseMapperPlus<InvSpaceDao, InvSpace, InvSpace> {
 
-    int deleteByPrimaryKey(Integer id);
 
     int insertEntity(InvSpace record);
 
     int insertSelective(InvSpace record);
 
-    InvSpace selectByPrimaryKey(Integer id);
 
     int updateByPrimaryKeySelective(InvSpace record);
 
@@ -103,4 +101,4 @@ public interface InvSpaceDao extends BaseMapperPlus<InvSpaceDao, InvSpace, InvSp
      * @return
      */
     String getMaxSpaceCode(@Param("invCode") String invCode);
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/glxp/api/entity/auth/InvSpace.java b/src/main/java/com/glxp/api/entity/auth/InvSpace.java
index 51a6467d..7e9e30f5 100644
--- a/src/main/java/com/glxp/api/entity/auth/InvSpace.java
+++ b/src/main/java/com/glxp/api/entity/auth/InvSpace.java
@@ -1,5 +1,7 @@
 package com.glxp.api.entity.auth;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.util.Date;
@@ -8,6 +10,7 @@ import java.util.Date;
  * 货位字典表
  */
 @Data
+@TableName(value = "auth_space")
 public class InvSpace {
 
     private Long id;
diff --git a/src/main/java/com/glxp/api/service/auth/impl/InvSpaceServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/InvSpaceServiceImpl.java
index 0a3b051c..c94182e9 100644
--- a/src/main/java/com/glxp/api/service/auth/impl/InvSpaceServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/auth/impl/InvSpaceServiceImpl.java
@@ -1,6 +1,7 @@
 package com.glxp.api.service.auth.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageHelper;
 import com.glxp.api.common.enums.ResultEnum;
@@ -68,7 +69,8 @@ public class InvSpaceServiceImpl implements InvSpaceService {
         invSpace.setUpdateTime(date);
         invSpace.setCreateUser(user.getUserName());
         invSpace.setUpdateUser(user.getUserName());
-        invSpaceDao.insertEntity(invSpace);
+        invSpace.setId(IdUtil.getSnowflakeNextId());
+        invSpaceDao.insert(invSpace);
         return ResultVOUtils.success();
     }
 
@@ -92,8 +94,8 @@ public class InvSpaceServiceImpl implements InvSpaceService {
     @Override
     public BaseResponse deleteSpace(String id) {
         //校验此货位是否已经被使用，如果已经被使用，不能删除
-        Integer spaceId = Integer.valueOf(id);
-        InvSpace invSpace = invSpaceDao.selectByPrimaryKey(spaceId);
+        Long spaceId = Long.valueOf(id);
+        InvSpace invSpace = invSpaceDao.selectById(spaceId);
 
         //todo 代码迁移，后面记得修改
 
@@ -108,7 +110,7 @@ public class InvSpaceServiceImpl implements InvSpaceService {
 //        if (count > 0) {
 //            return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "此货位已被使用，无法删除！");
 //        }
-        invSpaceDao.deleteByPrimaryKey(spaceId);
+        invSpaceDao.deleteById(spaceId);
         return ResultVOUtils.success();
     }
 
diff --git a/src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java
index 16efbe4c..382261d8 100644
--- a/src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java
@@ -115,7 +115,7 @@ public class InvWarehouseServiceImpl implements InvWarehouseService {
 
     @Override
     public boolean insertInvSubWarehouse(InvWarehouseEntity invWarehouseEntity) {
-        return invWarehouseDao.insertInvSubWarehouse(invWarehouseEntity);
+        return invWarehouseDao.insert(invWarehouseEntity) > 0;
     }
 
     @Override
diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrDeptService.java b/src/main/java/com/glxp/api/service/thrsys/ThrDeptService.java
index bc031d57..5927900b 100644
--- a/src/main/java/com/glxp/api/service/thrsys/ThrDeptService.java
+++ b/src/main/java/com/glxp/api/service/thrsys/ThrDeptService.java
@@ -11,6 +11,9 @@ public interface ThrDeptService {
 
 
     ThrDeptEntity findDefault(Boolean advaceType, Boolean isDefault);
+
+    boolean editExit(String code, String thirdSysFk, Long id);
+
     List<ThrDeptEntity> filterThrInvWarehouse(FilterThrDeptRequest filterThrDeptRequest);
 
     List<ThrDeptEntity> filterGroupInvWarehouse(FilterThrDeptRequest filterThrDeptRequest);
diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrDeptServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrDeptServiceImpl.java
index edf61e19..d1d5203f 100644
--- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrDeptServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrDeptServiceImpl.java
@@ -2,6 +2,7 @@ package com.glxp.api.service.thrsys.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.IdUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
@@ -47,6 +48,11 @@ public class ThrDeptServiceImpl implements ThrDeptService {
         return null;
     }
 
+    @Override
+    public boolean editExit(String code, String thirdSysFk, Long id) {
+        return thrDeptDao.exists(new QueryWrapper<ThrDeptEntity>().eq("code", code).eq("thirdSysFk", thirdSysFk).ne("id", id));
+    }
+
     @Override
     public List<ThrDeptEntity> filterThrInvWarehouse(FilterThrDeptRequest filterThrDeptRequest) {
         if (filterThrDeptRequest == null) {
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index e9e4b1db..cc8bc4c7 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: test
+    active: dev
   jmx:
     enabled: false
   servlet:
diff --git a/src/main/resources/mybatis/mapper/auth/DeptUserDao.xml b/src/main/resources/mybatis/mapper/auth/DeptUserDao.xml
index 706f0420..928a47ed 100644
--- a/src/main/resources/mybatis/mapper/auth/DeptUserDao.xml
+++ b/src/main/resources/mybatis/mapper/auth/DeptUserDao.xml
@@ -79,7 +79,8 @@
     <delete id="deleteByUser" parameterType="java.lang.Long">
         delete
         from auth_dept_user
-        where userId = #{userId} and deptId != 1
+        where userId = #{userId}
+          and deptId != 1
     </delete>
     <delete id="deleteByDept" parameterType="java.lang.Long">
         delete
diff --git a/src/main/resources/mybatis/mapper/auth/InvSpaceDao.xml b/src/main/resources/mybatis/mapper/auth/InvSpaceDao.xml
index 5d1b0a21..64401477 100644
--- a/src/main/resources/mybatis/mapper/auth/InvSpaceDao.xml
+++ b/src/main/resources/mybatis/mapper/auth/InvSpaceDao.xml
@@ -31,18 +31,6 @@
         remark
     </sql>
 
-    <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
-        select
-        <include refid="Base_Column_List"/>
-        from auth_space
-        where id = #{id,jdbcType=INTEGER}
-    </select>
-
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-        delete
-        from auth_space
-        where id = #{id,jdbcType=INTEGER}
-    </delete>
 
     <insert id="insertEntity" keyColumn="id" keyProperty="id" parameterType="com.glxp.api.entity.auth.InvSpace"
             useGeneratedKeys="true">
@@ -408,4 +396,4 @@
             </if>
         </where>
     </select>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml b/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml
index a979cd35..566069aa 100644
--- a/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml
+++ b/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml
@@ -134,7 +134,7 @@
             parameterType="com.glxp.api.entity.auth.InvWarehouseEntity">
         replace
                 INTO auth_warehouse
-                ( id, code, `name`, parentId, remark, defaultInv, advanceType, spUse,parentCode
+                ( id, code, `name`, parentId, remark, defaultInv, advanceType, spUse, parentCode
                 , thirdId, thirdId1, thirdId2, thirdId3, thirdId4)
         values (#{id},
                 #{code},
@@ -159,13 +159,13 @@
         WHERE id = #{id}
     </delete>
 
-    <select id="getByWareId"  resultType="com.glxp.api.entity.auth.InvWarehouseEntity">
-      select *
+    <select id="getByWareId" resultType="com.glxp.api.entity.auth.InvWarehouseEntity">
+        select *
         FROM auth_warehouse
         WHERE id = #{id}
     </select>
 
-    <select id="getByWarePcode"  resultType="com.glxp.api.entity.auth.InvWarehouseEntity">
+    <select id="getByWarePcode" resultType="com.glxp.api.entity.auth.InvWarehouseEntity">
         select *
         FROM auth_warehouse
         WHERE parentCode = #{parentCode}
@@ -217,6 +217,9 @@
             <if test="advanceType != null">
                 advanceType=#{advanceType},
             </if>
+            <if test="updateTime != null">
+                updateTime=#{updateTime},
+            </if>
             <if test="spUse != null">
                 spUse=#{spUse},
             </if>
@@ -311,8 +314,8 @@
                 AND a.advanceType = #{advanceType}
             </if>
             <if test="key != null and key != ''">
-                AND  (a.name like concat('%', #{key}, '%') or
-                a.code = #{key})
+                AND (a.name like concat('%', #{key}, '%') or
+                     a.code = #{key})
             </if>
         </where>
     </select>
@@ -371,7 +374,7 @@
                auth_dept.name warehouseName
         from auth_warehouse
                      inner join auth_dept on auth_warehouse.parentId = auth_dept.code
-                    LEFT join auth_warehouse_user on auth_warehouse.code = auth_warehouse_user.code
+                     LEFT join auth_warehouse_user on auth_warehouse.code = auth_warehouse_user.code
         <where>
             <if test="userId != null">
                 AND auth_warehouse_user.userId = #{userId}
@@ -435,12 +438,18 @@
     </select>
 
 
-    <select id="selectLowWarehouseAll" parameterType="java.lang.String" resultType="com.glxp.api.entity.auth.InvWarehouseEntity">
+    <select id="selectLowWarehouseAll" parameterType="java.lang.String"
+            resultType="com.glxp.api.entity.auth.InvWarehouseEntity">
         with recursive table_a as (
-            select * from auth_warehouse ta where parentCode = #{pcode}
-            union all
-            select tb.* from auth_warehouse tb inner join table_a on table_a.code = tb.parentCode
-        )
-        select * from  table_a
+                select *
+                from auth_warehouse ta
+                where parentCode = #{pcode}
+                union all
+                select tb.*
+                from auth_warehouse tb
+                             inner join table_a on table_a.code = tb.parentCode
+                )
+        select *
+        from table_a
     </select>
 </mapper>
diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql
index 3f302448..d2565465 100644
--- a/src/main/resources/schemas/schema_v2.1.sql
+++ b/src/main/resources/schemas/schema_v2.1.sql
@@ -350,3 +350,9 @@ CALL Pro_Temp_ColumnWork('auth_dept_user', 'userId', 'bigint', 2);
 CALL Pro_Temp_ColumnWork('auth_dept_user', 'deptId', 'bigint', 2);
 CALL Pro_Temp_ColumnWork('basic_bustype_pre', 'Id', 'bigint', 2);
 CALL Pro_Temp_ColumnWork('basic_export_status', 'remark', 'varchar(2048)', 2);
+CALL Pro_Temp_ColumnWork('auth_role', 'isCustomer', 'int', 1);
+
+ALTER TABLE `auth_dept_user`
+    ADD UNIQUE (`userId`, deptId);
+
+