部门调整

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

@@ -10,8 +10,10 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.alibaba.fastjson.JSONArray;
 import com.gic.api.base.commons.Page;
+import com.gic.enterprise.api.dto.GicTreeDTO;
 import com.gic.enterprise.api.dto.StoreDTO;
 import com.gic.enterprise.api.service.DepartmentService;
+import com.gic.enterprise.api.service.StoreGroupService;
 import com.gic.enterprise.api.service.StoreService;
 import com.gic.haoban.base.api.common.BasePageInfo;
 import com.gic.haoban.base.api.common.Constant;
@@ -34,6 +36,9 @@ public class DepartmentContoller extends WebBaseController{
 	@Autowired
 	private StoreService storeService;
 	
+	@Autowired
+	private StoreGroupService storeGroupService;
+	
 	@RequestMapping("department-list")
 	public HaobanResponse departmentList(String parentId) {
 		List<DepartmentDTO> list = departmentApiService.listByParentId(parentId);
@@ -183,32 +188,20 @@ public class DepartmentContoller extends WebBaseController{
 	public HaobanResponse unbindDepartmentList(String departmentId,String enterpriseId) {
 		List<String> list = new ArrayList<String>();
 		list.add(departmentId);
-		List<com.gic.enterprise.api.dto.DepartmentDTO> departmentList = departmentService.getDeptmentByPids(list);
-		
-		List<StoreDTO> storeList = storeService.listStoreByStoreGroupId(departmentId);
+		List<GicTreeDTO> departmentList = storeGroupService.listGicTree(enterpriseId,null, departmentId);
 		
 		List<DepartmentDTO> dtoList = new ArrayList<DepartmentDTO>();
-		for (com.gic.enterprise.api.dto.DepartmentDTO departmentDTO : departmentList) {
-			DepartmentDTO dto = departmentApiService.selectByRelatedId(departmentDTO.getDepartId());
+		for (GicTreeDTO departmentDTO : departmentList) {
+			DepartmentDTO dto = departmentApiService.selectByRelatedId(departmentDTO.getId());
 			if(dto == null) {
 				DepartmentDTO unBindDTO = new DepartmentDTO();
-				unBindDTO.setRelatedId(departmentDTO.getDepartId());
-				unBindDTO.setIsStore(0);
-				unBindDTO.setDepartmentName(departmentDTO.getDepartName());
+				unBindDTO.setRelatedId(departmentDTO.getId());
+				unBindDTO.setIsStore(departmentDTO.getType());
+				unBindDTO.setDepartmentName(departmentDTO.getName());
 				dtoList.add(unBindDTO);
 			}
 		}
 		
-		for (StoreDTO storeDTO : storeList) {
-			DepartmentDTO dto = departmentApiService.selectByRelatedId(storeDTO.getStoreId());
-			if(dto == null) {
-				DepartmentDTO unBindDTO = new DepartmentDTO();
-				unBindDTO.setRelatedId(storeDTO.getStoreId());
-				unBindDTO.setIsStore(0);
-				unBindDTO.setDepartmentName(storeDTO.getStoreName());
-				dtoList.add(unBindDTO);
-			}
-		}
 		return resultResponse(HaoBanErrCode.ERR_1,dtoList);
 		
 	}

haoban-manage3-web/src/main/webapp/WEB-INF/dubbo-haoban-manage-web.xml

@@ -28,4 +28,5 @@
 	<dubbo:reference interface="com.gic.enterprise.api.service.StoreService" id="storeService"/>
 	<dubbo:reference interface="com.gic.enterprise.api.service.DepartmentService" id="departmentService"/>
 	<dubbo:reference interface="com.gic.haoban.manage.api.service.DepartmentApiService" id="departmentApiService"/>
+	<dubbo:reference interface="com.gic.enterprise.api.service.StoreGroupService" id="storeGroupService"/>
 </beans>