Merge branch 'feature/xgh/zq12' into 'developer'

Feature/xgh/zq12

See merge request !2402

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/DepartmentMapper.java

@@ -43,7 +43,7 @@ public interface DepartmentMapper {
 	
 //	List<TabHaobanDepartment> listStoreByWxEnterpriseId(@Param("wxEnterpriseId")String wxEnterpriseId);
 	
-	TabHaobanDepartment getRootByEnterpriseId(@Param("wxEnterpriseId")String wxEnterpriseId);
+	List<TabHaobanDepartment> getRootByEnterpriseId(@Param("wxEnterpriseId")String wxEnterpriseId);
 	
 	Page<TabHaobanDepartment> pageFullStoreByWxEnterpriseId(@Param("wxEnterpriseId")String wxEnterpriseId,@Param("search")String search,@Param("storeIds")List<String> storeIds,@Param("minCount")int minCount);
 	

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/DepartmentServiceImpl.java

@@ -233,8 +233,11 @@ public class DepartmentServiceImpl implements DepartmentService {
 
     @Override
     public DepartmentDTO getRootByEnterpriseId(String wxEnterpriseId) {
-        TabHaobanDepartment tab = mapper.getRootByEnterpriseId(wxEnterpriseId);
-        return EntityUtil.changeEntityByJSON(DepartmentDTO.class, tab);
+        List<TabHaobanDepartment> tabList = mapper.getRootByEnterpriseId(wxEnterpriseId);
+        if(CollectionUtils.isEmpty(tabList) || tabList.size()>1) {
+            return null ;
+        }
+        return EntityUtil.changeEntityByJSON(DepartmentDTO.class, tabList.get(0));
     }
 
     @Override

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/StaffClerkRelationServiceImpl.java

@@ -198,8 +198,12 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
                     TabHaobanClerkMainStoreRelated mainStore = this.clerkMainStoreRelatedService.getMainStoreByStaffId(staffId, wxEnterpriseId, storeIdList) ;
                     String newStoreId = mainStore.getStoreId() ;
                     StaffClerkRelationDTO mainClerk = this.getOneBindByStoreId(staffId, newStoreId) ;
-                    newClerkId = mainClerk.getClerkId() ;
-                    logger.info("查询到成员的主门店导购={},{}",staffId,newClerkId);
+                    if(null != mainClerk) {
+                        newClerkId = mainClerk.getClerkId();
+                        logger.info("查询到成员的主门店导购={},{}", staffId, newClerkId);
+                    }else {
+                        logger.info("未匹配到导购={},{}",staffId,newStoreId);
+                    }
                 }
             }else {
                 if(multipleFlag) {

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/DepartmentContoller.java

@@ -92,6 +92,9 @@ public class DepartmentContoller extends WebBaseController {
             page = departmentApiService.pageByParentId(parentId, keyWord, pageInfo);
         } else {
             DepartmentDTO dto = departmentApiService.getRootByEnterpriseId(wxEnterpriseId);
+            if(null == dto) {
+                return new HaobanResponse(-1,"根部门异常,请重新同步通讯录") ;
+            }
             list.add(dto);
             page.setTotalPage(1);
             page.setTotalCount(1);
@@ -131,6 +134,9 @@ public class DepartmentContoller extends WebBaseController {
             list = departmentApiService.listByParentId(parentId);
         } else {
             DepartmentDTO dto = departmentApiService.getRootByEnterpriseId(wxEnterpriseId);
+            if(null == dto) {
+                return new HaobanResponse(-1,"根部门异常,请重新同步通讯录") ;
+            }
             list.add(dto);
         }
         Set<String> enterpriseSet = new HashSet<>();

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/StaffController.java

@@ -498,6 +498,9 @@ public class StaffController extends WebBaseController {
         String wxEnterpriseId = login.getWxEnterpriseId();
         if(StringUtils.isBlank(departmentId)){
             DepartmentDTO dto = this.departmentApiService.getRootByEnterpriseId(wxEnterpriseId) ;
+            if(null == dto) {
+                return new HaobanResponse(-1,"根部门异常,请重新同步通讯录") ;
+            }
             departmentId = dto.getDepartmentId() ;
         }
         List<String> departmentIdSet = new ArrayList<>();