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

@@ -159,6 +159,11 @@ public class DepartmentApiServiceImpl implements DepartmentApiService {
 		hr.setResult(department);
 		//调微信的修改接口
 		TabHaobanDepartment tab = departmentService.selectById(department.getDepartmentId());
+		if(tab == null){
+			hr.setErrorCode(0);
+			hr.setMessage("部门不存在");
+			return hr;
+		}
 		logger.info("【部门修改】tab={}",JSON.toJSONString(tab));
 		WxEnterpriseDTO enterpriseDTO = wxEnterpriseService.selectById(tab.getWxEnterpriseId());
 		TabHaobanWxApplication application = wxApplicationService.selectByWxEnterpriseIdAndApplicationType(tab.getWxEnterpriseId(),1);

haoban-manage3-service/src/main/resources/mapper/DepartmentMapper.xml

@@ -30,6 +30,7 @@
     <include refid="Base_Column_List" />
     from tab_haoban_department
     where department_id = #{departmentId,jdbcType=VARCHAR}
+    and status_flag = 1
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
     delete from tab_haoban_department

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

@@ -461,7 +461,8 @@ public class DepartmentContoller extends WebBaseController{
 				String departmentId = departmentAddQO.getDepartmentId();
 				Boolean addFlag = departmentAddQO.getAddFlag();
 				//在部门下新增部门
-				if(addFlag != null && addFlag) {
+				DepartmentDTO oldDepartment = departmentApiService.selectById(departmentId);
+				if(addFlag != null && addFlag && oldDepartment == null) {
 					DepartmentDTO department = new DepartmentDTO();
 					department.setParentDepartmentId(parentId);
 					department.setWxEnterpriseId(dto.getWxEnterpriseId());

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

@@ -137,7 +137,13 @@ public class StaffController extends WebBaseController{
 		if(staff == null) {
 			return resultResponse(HaoBanErrCode.ERR_10006);
 		}
-		
+		String phoneNumber = staffDTO.getPhoneNumber();
+		String nationcode = staffDTO.getNationCode();
+		String wxEnterpriseId = staff.getWxEnterpriseId();
+		StaffDTO old = staffApiService.selectByNationcodeAndPhoneNumber(wxEnterpriseId,nationcode,phoneNumber);
+		if(old != null && !old.getStaffId().equals(staffId)){
+			return resultResponse(HaoBanErrCode.ERR_10005);
+		}
 		staffApiService.staffEdit(staffDTO,departmentIds);
 		return resultResponse(HaoBanErrCode.ERR_1);
 	}