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/StaffDepartmentRelatedApiServiceImpl.java

@@ -87,7 +87,7 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
 	}
 	@Override
 	public StaffDepartmentRelatedDTO getOneByStaffIdAndDepartmentId(String staffId, String departmentId) {
-		TabHaobanStaffDepartmentRelated tab = staffDepartmentRelatedMapper.getDepartmentIdAndStaffId(staffId,departmentId);
+		TabHaobanStaffDepartmentRelated tab = staffDepartmentRelatedMapper.getDepartmentIdAndStaffId(departmentId,staffId);
 		if(tab== null){
 			return null;
 		}

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

@@ -189,6 +189,9 @@ public class ClerkController extends WebBaseController{
 				staffDepartmentRelatedApiService.deleteCode(one);
 			}
 			StaffDepartmentRelatedDTO dto = staffDepartmentRelatedApiService.getOneByStaffIdAndDepartmentId(toStaffId, departmentId);
+			if(dto == null){
+				return resultResponse(HaoBanErrCode.ERR_400017);
+			}
 				//存在，则先置空
 			dto.setClerkCode(fromClerkCode);
 			dto.setUpdateTime(new Date());
@@ -203,6 +206,9 @@ public class ClerkController extends WebBaseController{
 				staffDepartmentRelatedApiService.deleteCode(one);
 			}
 			StaffDepartmentRelatedDTO dto = staffDepartmentRelatedApiService.getOneByStaffIdAndDepartmentId(toStaffId, departmentId);
+			if(dto == null){
+				return resultResponse(HaoBanErrCode.ERR_400017);
+			}
 			dto.setClerkCode(fromClerkCode);
 			dto.setUpdateTime(new Date());
 			staffDepartmentRelatedApiService.updateById(dto);

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/errCode/HaoBanErrCode.java

@@ -88,6 +88,8 @@ public enum HaoBanErrCode {
     ERR_400014(400014, "仅支持认证企业建立企业通讯录共享"),
     ERR_400015(400015, "数据为空"),
     ERR_400016(400016, "提交人不存在"),
+    ERR_400017(400017, "成员不存在"),
+
     /**
      * 文件不存在
      */