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/dao/mapper/DepartmentMapper.java

@@ -25,7 +25,7 @@ public interface DepartmentMapper {
 
 	int selectMaxSort(@Param("parentDepartmentId")String parentDepartmentId);
 
-	TabHaobanDepartment selectByRelatedId(@Param("relatedId")String relatedId);
+	List<TabHaobanDepartment> selectByRelatedId(@Param("relatedId")String relatedId);
 
 	List<TabHaobanDepartment> getByWxId(@Param("wxDepartmentId")String wxDepartmentId, @Param("wxEnterpriseId") String wxEnterpriseId);
 	

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

@@ -79,7 +79,11 @@ public class DepartmentServiceImpl implements DepartmentService {
 
 	@Override
 	public TabHaobanDepartment selectByRelatedId(String relatedId) {
-		return mapper.selectByRelatedId(relatedId);
+		List<TabHaobanDepartment> list = mapper.selectByRelatedId(relatedId);
+		if(CollectionUtils.isNotEmpty(list)){
+			return list.get(0);
+		}
+		return null;
 	}
 
 	@Override

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

@@ -81,10 +81,10 @@ public class MessageApiServiceImpl implements MessageApiService {
             departmentDTO.setChainName(parentDepartment.getChainName() + Constant.NAME_SEPARATOR + parentDepartment.getChainName());
             departmentDTO.setLevel(parentDepartment.getLevel() + 1);
             departmentDTO.setWxEnterpriseId(enterprise.getWxEnterpriseId());
-            if(dto.getType() == GicEditType.ADD.getCode()){
+            if(dto.getChangeType() == GicEditType.ADD.getCode()){
                 HaobanResponse response = this.departmentApiService.add(departmentDTO);
                 log.info("添加结果：{}", JSON.toJSONString(response));
-            }else if(dto.getType() == GicEditType.UPDATE.getCode()){
+            }else if(dto.getChangeType() == GicEditType.UPDATE.getCode()){
                 TabHaobanDepartment department = this.departmentService.selectByRelatedId(dto.getId());
                 if(department == null){
                     HaobanResponse response = this.departmentApiService.add(departmentDTO);