Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer

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

@@ -125,7 +125,7 @@ public class StaffApiServiceImpl implements StaffApiService {
 				userDTO.setName(staff.getStaffName());
 				userDTO.setUserid(staffId);
 				userDTO.setAlias(staff.getNickName());
-				userDTO.setExternalPosition(tab.getExtendPostion());
+				userDTO.setExternal_position(tab.getExtendPostion());
 				userDTO.setPosition(tab.getPostion());
 				if(activeFlag == 1) {
 					userDTO.setTo_invite(true);
@@ -263,7 +263,7 @@ public class StaffApiServiceImpl implements StaffApiService {
 					tab.setSex(user.getGender() == null ? 1:Integer.parseInt(user.getGender()));
 					tab.setActiveFlag(1);
 					tab.setPostion(user.getPosition());
-					tab.setExtendPostion(user.getExternalPosition());
+					tab.setExtendPostion(user.getExternal_position());
 					String staffId = staffService.add(tab);
 					
 					Integer[] departmentId = user.getDepartment();
@@ -392,7 +392,7 @@ public class StaffApiServiceImpl implements StaffApiService {
 				userDTO.setName(staffDTO.getStaffName());
 				userDTO.setUserid(oldStaff.getWxUserId());
 				userDTO.setPosition(staffDTO.getPostion());
-				userDTO.setExternalPosition(staffDTO.getExtendPostion());
+				userDTO.setExternal_position(staffDTO.getExtendPostion());
 				JSONResponse jp = qywxUserApiService.updateWorkWxUser(userDTO, enterpriseDTO.getCorpid(), application.getSiteId());
 				
 			}

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

@@ -23,8 +23,10 @@ import com.gic.commons.util.EntityUtil;
 import com.gic.enterprise.api.dto.StoreDTO;
 import com.gic.enterprise.api.service.StoreService;
 import com.gic.haoban.common.utils.HaobanResponse;
+import com.gic.haoban.manage.api.dto.DepartmentDTO;
 import com.gic.haoban.manage.api.dto.StaffDTO;
 import com.gic.haoban.manage.api.dto.StaffDepartmentRelatedDTO;
+import com.gic.haoban.manage.api.service.DepartmentApiService;
 import com.gic.haoban.manage.api.service.StaffApiService;
 import com.gic.haoban.manage.api.service.StaffDepartmentRelatedApiService;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
@@ -44,6 +46,9 @@ public class ClerkController extends WebBaseController{
 	private StaffDepartmentRelatedApiService staffDepartmentRelatedApiService;
 	@Autowired
 	private StoreService storeService;
+	@Autowired
+	private DepartmentApiService departmentApiService;
+	
 	//导购列表
 	@RequestMapping("/clerk-list")
 	public HaobanResponse clerkList(String storeId,String bindFlag,String departmentId) {
@@ -99,9 +104,7 @@ public class ClerkController extends WebBaseController{
 	}
 	//选择成员列表
 	@RequestMapping("/staff-list")
-	public HaobanResponse staffList(String storeId,String departmentId) {
-		boolean b = StringUtils.isAnyBlank(departmentId);
-		logger.info("b===========================>{}",b);
+	public HaobanResponse staffList(String departmentId) {
 		if(StringUtils.isAnyBlank(departmentId)){
 			return resultResponse(HaoBanErrCode.ERR_2);
 		}
@@ -122,23 +125,31 @@ public class ClerkController extends WebBaseController{
 				dto.setBindFlag(0);
 			}
 		}
-		String storeClerkCode = "";
-		StoreDTO storeDTO = storeService.getStore(storeId);
-		if(storeDTO!=null){
-			String clerkId = storeDTO.getClerkId();
-			ClerkDTO clerkDTO = clerkService.getClerkByClerkId(clerkId);
-			if(clerkDTO!=null){
-				storeClerkCode = clerkDTO.getClerkCode();
+		
+		//查找店长clerkType
+		DepartmentDTO departmentDTO = departmentApiService.selectById(departmentId);
+		String storeId = departmentDTO.getRelatedId();
+		if(StringUtils.isEmpty(storeId)){
+		}else{
+			String storeClerkCode = "";
+			StoreDTO storeDTO = storeService.getStore(storeId);
+			if(storeDTO!=null){
+				String clerkId = storeDTO.getClerkId();
+				ClerkDTO clerkDTO = clerkService.getClerkByClerkId(clerkId);
+				if(clerkDTO!=null){
+					storeClerkCode = clerkDTO.getClerkCode();
+				}
 			}
-		}
-		if(StringUtil.isNotBlank(storeClerkCode)){
-			for(StaffDTO dto :resultlist){
-				if(storeClerkCode.equals(dto.getClerkCode())){
-					dto.setClerkType(1);
+			if(StringUtil.isNotBlank(storeClerkCode)){
+				for(StaffDTO dto :resultlist){
+					if(storeClerkCode.equals(dto.getClerkCode())){
+						dto.setClerkType(1);
+					}
 				}
 			}
 		}
 		
+		logger.info("result   ClerkCode =================>{}",JSONObject.toJSONString(resultlist));
 		return resultResponse(HaoBanErrCode.ERR_1,resultlist);
 		
 	}