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

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

@@ -124,6 +124,7 @@ public class BindApiServiceImpl implements BindApiService {
 			for(ClerkDTO clerkDTO :list){
 				clerkDTO.setPhoneNumber(staffDTO.getPhoneNumber());
 				clerkDTO.setClerkName(staffDTO.getStaffName());
+				clerkDTO.setHeadImgUrl(staffDTO.getHeadImg());
 				clerkService.updateClerk(clerkDTO);
 			}
 			//清空gic原来的手机号
@@ -133,6 +134,7 @@ public class BindApiServiceImpl implements BindApiService {
 			for(ClerkDTO clerkDTO :oldList){
 				clerkDTO.setPhoneNumber("--");
 				clerkDTO.setClerkName("--");
+				clerkDTO.setHeadImgUrl("");
 				clerkService.updateClerk(clerkDTO);
 			}
 
@@ -165,6 +167,7 @@ public class BindApiServiceImpl implements BindApiService {
 			for(ClerkDTO clerkDTO :list){
 				clerkDTO.setPhoneNumber(staffDTO.getPhoneNumber());
 				clerkDTO.setClerkName(staffDTO.getStaffName());
+				clerkDTO.setHeadImgUrl(staffDTO.getHeadImg());
 				clerkService.updateClerk(clerkDTO);
 			}
 			
@@ -177,6 +180,7 @@ public class BindApiServiceImpl implements BindApiService {
 			for(ClerkDTO clerkDTO :oldList){
 				clerkDTO.setPhoneNumber("--");
 				clerkDTO.setClerkName("--");
+				clerkDTO.setHeadImgUrl("");
 				clerkService.updateClerk(clerkDTO);
 			}
 		}		
@@ -200,6 +204,8 @@ public class BindApiServiceImpl implements BindApiService {
 		List<ClerkDTO> list = clerkService.listClerk(storeId, clerkCodes, true);
 		for(ClerkDTO clerkDTO :list){
 			clerkDTO.setPhoneNumber("--");
+			clerkDTO.setClerkName("--");
+			clerkDTO.setHeadImgUrl("");
 			clerkService.updateClerk(clerkDTO);
 		}		
 	}
@@ -211,15 +217,18 @@ public class BindApiServiceImpl implements BindApiService {
 		if(oldStaffDepartmentRelatedDTO!=null){
 			//删除gic测的手机号和姓名
 			String clerkCode = oldStaffDepartmentRelatedDTO.getClerkCode();
-			DepartmentDTO departmentDTO = departmentApiService.selectById(departmentId);
-			String storeId = departmentDTO.getRelatedId();
-			List<String> clerkCodes = new ArrayList<>();
-			clerkCodes.add(clerkCode);
-			List<ClerkDTO> list = clerkService.listClerk(storeId, clerkCodes, true);
-			for(ClerkDTO clerkDTO :list){
-				clerkDTO.setPhoneNumber("--");
-				clerkDTO.setClerkName("--");
-				clerkService.updateClerk(clerkDTO);
+			if(StringUtils.isNotBlank(clerkCode)){
+				DepartmentDTO departmentDTO = departmentApiService.selectById(departmentId);
+				String storeId = departmentDTO.getRelatedId();
+				List<String> clerkCodes = new ArrayList<>();
+				clerkCodes.add(clerkCode);
+				List<ClerkDTO> list = clerkService.listClerk(storeId, clerkCodes, true);
+				for(ClerkDTO clerkDTO :list){
+					clerkDTO.setPhoneNumber("--");
+					clerkDTO.setClerkName("--");
+					clerkDTO.setHeadImgUrl("");
+					clerkService.updateClerk(clerkDTO);
+				}
 			}
 		}
 		//将指定人绑定clerkCode
@@ -240,6 +249,7 @@ public class BindApiServiceImpl implements BindApiService {
 		for(ClerkDTO clerkDTO :list){
 			clerkDTO.setPhoneNumber(staffDTO.getPhoneNumber());
 			clerkDTO.setClerkName(staffDTO.getStaffName());
+			clerkDTO.setHeadImgUrl(staffDTO.getHeadImg());
 			clerkService.updateClerk(clerkDTO);
 		}		
 	}

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

@@ -56,8 +56,8 @@ public class LoginController extends WebBaseController{
 			return ;
 		}
 		UserDTO user  = JSON.parseObject(userJson, UserDTO.class);
-		logger.info("【企业微信登录】userId={},auth_code={}",user.getUserid(),auth_code);
 		String corpId = user.getCorpid();
+		logger.info("【企业微信登录】userId={},auth_code={},corpId={}",user.getUserid(),auth_code,corpId);
 		WxEnterpriseDTO enterprise = wxEnterpriseApiService.getEnterpriseBycorpId(corpId);
 		StaffDTO loginStaff = null;
 		if(enterprise != null){