修改bug

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

@@ -14,6 +14,7 @@ import com.glxp.api.admin.res.PageSimpleResponse;
 import com.glxp.api.admin.res.auth.AuthAdminResponse;
 import com.glxp.api.admin.res.auth.AuthAdminRoleResponse;
 import com.glxp.api.admin.service.auth.*;
+import com.glxp.api.admin.service.inout.WarehouseUserService;
 import com.glxp.api.admin.service.inventory.InvSubWarehouseService;
 import com.glxp.api.admin.util.GennerOrderUtils;
 import com.glxp.api.admin.util.PasswordUtils;
@@ -52,6 +53,11 @@ public class AuthAdminController {
     @Resource
     private CustomerService customerService;
 
+    @Resource
+    private WarehouseUserService warehouseUserService;
+
+
+
     /**
      * 获取管理员列表
      */
@@ -267,14 +273,16 @@ public class AuthAdminController {
         if (authAdminSaveRequest.getId() == null) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "参数错误！");
         }
-
+        // 先得到要删除角色的 getLocSubInvCode
+        AuthAdmin byId = authAdminService.findById(authAdminSaveRequest.getId());
         boolean b = authAdminService.deleteById(authAdminSaveRequest.getId());
         if (!b) {
             return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
         }
+
         // 先删除之前的角色
         authRoleAdminService.deleteByAdminId(authAdminSaveRequest.getId());
-
+        warehouseUserService.deleteByCodeAndId(authAdminSaveRequest.getId(),byId.getLocSubInvCode());
         return ResultVOUtils.success();
     }
 

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

@@ -1287,7 +1287,7 @@ public class WareHouseController {
                     continue;
                 }
             }
-            if (!isExit) {
+            if (isExit) {
                 filteBusTypes.put(invBusUserEntity.getUserId(), invBusUserEntity);
             }
         }

api-admin/src/main/java/com/glxp/api/admin/dao/inout/WarehouseBussinessTypeDao.java

@@ -37,6 +37,8 @@ public interface WarehouseBussinessTypeDao {
 
     void deleteByCode(@Param("code") String code);
 
+
+
     /**
      * 根据单据类型编码查询单据类型列表
      *

api-admin/src/main/java/com/glxp/api/admin/dao/inout/WarehouseUserDao.java

@@ -8,6 +8,7 @@ import java.util.List;
 
 public interface WarehouseUserDao {
     int deleteByPrimaryKey(Integer id);
+    int deleteByCodeAndId(@Param("id") Long id,@Param("code") String code);
 
     List<WarehouseUserEntity> filterList(FilterInvUserRequest filterInvUserRequest);
 

api-admin/src/main/java/com/glxp/api/admin/service/inout/WarehouseUserService.java

@@ -5,6 +5,7 @@ import com.glxp.api.admin.entity.auth.AuthAdmin;
 import com.glxp.api.admin.entity.inout.WarehouseUserEntity;
 import com.glxp.api.admin.req.inventory.FilterInvLinkDataRequest;
 import com.glxp.api.admin.req.inventory.FilterInvUserRequest;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -49,6 +50,8 @@ public interface WarehouseUserService {
      */
     void deleteWarehouseUser(Integer id);
 
+    void deleteByCodeAndId(Long id,  String code);
+
     /**
      * 查询分仓关联的用户列表
      *

api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/WarehouseUserServiceImpl.java

@@ -105,6 +105,13 @@ public class WarehouseUserServiceImpl implements WarehouseUserService {
         }
     }
 
+    @Override
+    public void deleteByCodeAndId(Long id, String code) {
+        if(null !=id && null !=code){
+            warehouseUserDao.deleteByCodeAndId(id,code);
+        }
+    }
+
     @Override
     public List<WarehouseUserEntity> getWarehouseUserList(FilterInvLinkDataRequest filterInvLinkDataRequest) {
         if (filterInvLinkDataRequest == null) {

api-admin/src/main/resources/mybatis/mapper/inout/WarehouseBussinessTypeDao.xml

@@ -25,6 +25,7 @@
         delete from inv_warehouse_bussiness_type
         where id = #{id,jdbcType=INTEGER}
     </delete>
+
     <insert id="insert" keyColumn="id" keyProperty="id"
             parameterType="com.glxp.api.admin.entity.inout.WarehouseBussinessTypeEntity" useGeneratedKeys="true">
         <!--@mbg.generated-->

api-admin/src/main/resources/mybatis/mapper/inout/WarehouseUserDao.xml

@@ -9,10 +9,11 @@
         <result column="userId" jdbcType="BIGINT" property="userid"/>
         <result column="userName" jdbcType="VARCHAR" property="username"/>
         <result column="isDirector" javaType="boolean" property="isDirector"/>
+
     </resultMap>
     <sql id="Base_Column_List">
         <!--@mbg.generated-->
-        id, code, userId, userName, isDirector
+        id, code, userId, userName, isDirector,locSubInvCode
     </sql>
     <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
         <!--@mbg.generated-->
@@ -26,6 +27,11 @@
         delete from inv_warehouse_user
         where id = #{id,jdbcType=INTEGER}
     </delete>
+    <delete id="deleteByCodeAndId"   >
+        <!--@mbg.generated-->
+        delete from inv_warehouse_user
+        where userid = #{id} and code=#{code}
+    </delete>
     <insert id="insert" keyColumn="id" keyProperty="id"
             parameterType="com.glxp.api.admin.entity.inout.WarehouseUserEntity" useGeneratedKeys="true">
         <!--@mbg.generated-->