fix

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

@@ -200,17 +200,19 @@ public class MessageApiServiceImpl implements MessageApiService {
         departmentDTO.setWxDepartmentId(qywxCallBackDTO.getId()+"");
         if(qywxCallBackDTO.getParentId() != null){
         	List<com.gic.wechat.api.dto.qywx.DepartmentDTO> list = this.qywxDepartmentApiService.listDepartment(qywxCallBackDTO.getAuthCorpId(), qywxCallBackDTO.getSuiteId(), qywxCallBackDTO.getParentId());
-        	for (com.gic.wechat.api.dto.qywx.DepartmentDTO departmentDTO2 : list) {
-				if(departmentDTO2.getId().equals(departmentDTO.getDepartmentId())){
-					departmentDTO.setSort(qywxCallBackDTO.getOrder());
-				}else{
-					TabHaobanDepartment tab = this.departmentService.getByWxId(departmentDTO2.getId() + "", enterprise.getWxEnterpriseId());
-					if(tab != null){
-						tab.setSort(departmentDTO2.getOrder());
-						this.departmentService.edit(EntityUtil.changeEntityByJSON(DepartmentDTO.class, tab));
-					}
-				}
-			}
+        	if(list != null){
+        		for (com.gic.wechat.api.dto.qywx.DepartmentDTO departmentDTO2 : list) {
+    				if(departmentDTO2.getId().equals(departmentDTO.getDepartmentId())){
+    					departmentDTO.setSort(qywxCallBackDTO.getOrder());
+    				}else{
+    					TabHaobanDepartment tab = this.departmentService.getByWxId(departmentDTO2.getId() + "", enterprise.getWxEnterpriseId());
+    					if(tab != null){
+    						tab.setSort(departmentDTO2.getOrder());
+    						this.departmentService.edit(EntityUtil.changeEntityByJSON(DepartmentDTO.class, tab));
+    					}
+    				}
+    			}
+        	}
         }
         if(qywxCallBackDTO.getChangeType().equals(WxEditType.ADDDEPART.getCode())){
             String response = this.departmentService.add(departmentDTO);