Commit dc69da0f by qwmqiuwenmin

fix

parent 7c6a13b9
...@@ -11,10 +11,7 @@ import org.springframework.web.bind.annotation.RestController; ...@@ -11,10 +11,7 @@ import org.springframework.web.bind.annotation.RestController;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.gic.api.base.commons.Page; import com.gic.api.base.commons.Page;
import com.gic.enterprise.api.dto.GicTreeDTO; 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.StoreGroupService;
import com.gic.enterprise.api.service.StoreService;
import com.gic.haoban.base.api.common.BasePageInfo; import com.gic.haoban.base.api.common.BasePageInfo;
import com.gic.haoban.base.api.common.Constant; import com.gic.haoban.base.api.common.Constant;
import com.gic.haoban.common.utils.AuthRequestUtil; import com.gic.haoban.common.utils.AuthRequestUtil;
...@@ -30,11 +27,6 @@ import com.gic.haoban.manage.web.vo.LoginVO; ...@@ -30,11 +27,6 @@ import com.gic.haoban.manage.web.vo.LoginVO;
public class DepartmentContoller extends WebBaseController{ public class DepartmentContoller extends WebBaseController{
@Autowired @Autowired
private DepartmentApiService departmentApiService; private DepartmentApiService departmentApiService;
@Autowired
private DepartmentService departmentService;
@Autowired
private StoreService storeService;
@Autowired @Autowired
private StoreGroupService storeGroupService; private StoreGroupService storeGroupService;
...@@ -185,10 +177,10 @@ public class DepartmentContoller extends WebBaseController{ ...@@ -185,10 +177,10 @@ public class DepartmentContoller extends WebBaseController{
} }
@RequestMapping("unbind-department-list") @RequestMapping("unbind-department-list")
public HaobanResponse unbindDepartmentList(String departmentId,String enterpriseId) { public HaobanResponse unbindDepartmentList(String departmentId,String enterpriseId,Integer type) {
List<String> list = new ArrayList<String>(); List<String> list = new ArrayList<String>();
list.add(departmentId); list.add(departmentId);
List<GicTreeDTO> departmentList = storeGroupService.listGicTree(enterpriseId,null, departmentId); List<GicTreeDTO> departmentList = storeGroupService.listGicTree(enterpriseId,type, departmentId);
List<DepartmentDTO> dtoList = new ArrayList<DepartmentDTO>(); List<DepartmentDTO> dtoList = new ArrayList<DepartmentDTO>();
for (GicTreeDTO departmentDTO : departmentList) { for (GicTreeDTO departmentDTO : departmentList) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment