Merge remote-tracking branch 'origin/master'

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

@@ -160,6 +160,7 @@ public class DeptController extends BaseController {
         }
 
         filterInvWarehouseRequest.setPid(0);
+        filterInvWarehouseRequest.setSpUse(true);
         invWarehouseEntities = deptService.filterAllByUser(filterInvWarehouseRequest);
         return ResultVOUtils.success(invWarehouseEntities);
 

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

@@ -109,6 +109,7 @@ public class InvWarehouseController extends BaseController {
         } else {
             filterInvWarehouseRequest.setUserId(null);
         }
+        filterInvWarehouseRequest.setSpUse(true);
         List<InvWarehouseEntity> invSubWarehouseEntities = invWarehouseService.filterGroupInvSub(filterInvWarehouseRequest);
         return ResultVOUtils.success(invSubWarehouseEntities);
     }

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

@@ -246,10 +246,14 @@ public class RegisterController {
         if (StrUtil.isNotBlank(company_check) && company_check.equals("1")) {
             //新用户注册时根据往来单位字典进行企业名称校验
             CustomerInfoEntity customerInfoEntity = customerInfoService.selectById(userRegisterEntity.getCompanyId());
-            if (customerInfoEntity != null) {
+            if (customerInfoEntity != null ) {
                 return ResultVOUtils.error(500, "该企业已被注册！");
             }
         }
+        UserRegisterEntity userRegisterEntity2 = userRegisterService.selectByCname(userRegisterEntity.getCompanyName());
+        if (userRegisterEntity2 !=null ) {
+            return ResultVOUtils.error(500, "该企业已被注册！");
+        }
 
         userRegisterEntity.setRegisterTime(DateUtil.getDateTime());
         userRegisterEntity.setCheckType(0);//未审核

src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java

@@ -237,7 +237,7 @@ public class UdiRlSupController extends BaseController {
         udiRelevanceEntity.setLockStatus(1);
         udiRelevanceService.updateUdiRelevance(udiRelevanceEntity);
         UdiProductEntity udiProductEntity = new UdiProductEntity();
-        BeanUtils.copyProperties(udiProductEntity, udiInfoExportRequest.getSupplementRequest());
+        BeanUtils.copyProperties(udiInfoExportRequest.getSupplementRequest(),udiProductEntity);
         udiProductService.insertUdiInfo(udiProductEntity);
         return ResultVOUtils.success("选入成功！");
     }

src/main/java/com/glxp/api/dao/auth/UserRegisterDao.java

@@ -12,6 +12,10 @@ public interface UserRegisterDao {
 
     List<UserRegisterEntity> filterUserRegisters(UserResisterFilterRequest userResisterFilterRequest);
 
+    UserRegisterEntity selectByCname(String cName);
+
+
+
     boolean insertUserRegister(UserRegisterEntity userRegisterEntity);
 
     boolean updateUserRegister(UserRegisterEntity userRegisterEntity);

src/main/java/com/glxp/api/service/auth/UserRegisterService.java

@@ -11,6 +11,8 @@ public interface UserRegisterService {
 
     boolean insertUserRegister(UserRegisterEntity userRegisterEntity);
 
+    UserRegisterEntity selectByCname(String cName);
+
     boolean updateUserRegister(UserRegisterEntity userRegisterEntity);
 
     boolean deleteById(Long id);

src/main/java/com/glxp/api/service/auth/impl/UserRegisterServiceImpl.java

@@ -33,6 +33,11 @@ public class UserRegisterServiceImpl implements UserRegisterService {
         return userRegisterDao.insertUserRegister(userRegisterEntity);
     }
 
+    @Override
+    public UserRegisterEntity selectByCname(String cName) {
+        return userRegisterDao.selectByCname(cName);
+    }
+
     @Override
     public boolean updateUserRegister(UserRegisterEntity userRegisterEntity) {
         return userRegisterDao.updateUserRegister(userRegisterEntity);

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

@@ -78,7 +78,7 @@
                 AND `level` = #{level}
             </if>
             <if test="spUse != null">
-                AND spUse = #{spUse}
+                AND auth_dept.spUse = #{spUse}
             </if>
         </where>
         group by auth_dept.code

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

@@ -358,7 +358,7 @@
                auth_dept.name warehouseName
         from auth_warehouse
                      inner join auth_dept on auth_warehouse.parentId = auth_dept.code
-                     inner 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}

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

@@ -17,6 +17,14 @@
         </where>
     </select>
 
+    <select id="selectByCname" parameterType="java.lang.String"
+            resultType="com.glxp.api.entity.auth.UserRegisterEntity">
+        SELECT *
+        FROM user_register
+            where companyName=#{cName}
+    </select>
+
+
 
     <insert id="insertUserRegister" keyProperty="id" parameterType="com.glxp.api.entity.auth.UserRegisterEntity">
         INSERT INTO user_register