Merge remote-tracking branch 'origin/developer' into developer

gic-store-service/src/main/java/com/gic/store/dao/mapper/TabClerkMapper.java

@@ -117,7 +117,7 @@ public interface TabClerkMapper {
      * @return java.lang.Integer
      * @throws
      */
-    Integer getTotalClerk(@Param("enterpriseId") Integer enterpriseId, @Param("storeClerkIds") List<Integer> storeClerkIds, @Param("search") String search, @Param("status") int status);
+    Integer getTotalClerk(@Param("enterpriseId") Integer enterpriseId, @Param("storeClerkIds") List<Integer> storeClerkIds, @Param("search") String search, @Param("status") Integer status);
 
     /**
      * getStoreInfoIdsBySearch

gic-store-service/src/main/java/com/gic/store/service/outer/impl/ClerkPositionApiServiceImpl.java

@@ -115,7 +115,7 @@ public class ClerkPositionApiServiceImpl implements ClerkPositionApiService {
         }
         Map<Integer, Integer> map = clerkService.countMapByPosition(clerkPosition.getEnterpriseId(), Collections.singletonList(clerkPosition.getClerkPositionId()));
         Integer count = map.get(clerkPosition.getClerkPositionId());
-        if (count > 0) {
+        if (count != null && count > 0) {
             return EnterpriseServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "角色正在被使用中，无法删除");
         }
         this.clerkPositionService.deleteById(clerkPositionId);

gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreApiServiceImpl.java

@@ -542,12 +542,17 @@ public class StoreApiServiceImpl implements StoreApiService {
             } else {
                 // 判断分组是否存在
                 TabStoreGroup group = storeGroupService.getStoreGroupById(storeDTO.getStoreGroupId());
-                if (group != null) {
-                    storeDTO.setStoreGroupId(group.getStoreGroupId());
-                } else {
+                if (group == null) {
                     logger.info("enterpriseId:{}, groupName:{}, 不存在该分组", storeDTO.getEnterpriseId(), storeDTO.getStoreGroupName());
                     return "门店分组不存在";
                 }
+                if (storeGroupService.isLeafNode(group.getStoreGroupId())) {
+                    // 如果是叶子节点
+                    storeDTO.setStoreGroupId(group.getStoreGroupId());
+                } else {
+                    logger.info("enterpriseId:{}, groupName:{}, groupId:{}, 分组不是叶子节点", storeDTO.getEnterpriseId(), storeDTO.getStoreGroupName(), group.getStoreGroupId());
+                    return "分组不是叶子节点";
+                }
             }
         } else {
             // 启用分组策略