Skip to content

H
haoban-manage3.0
Commit 1554b495 by qwmqiuwenmin
Options

fix

parent 2d5e13e9
Showing with 12 additions and 3 deletions
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/DepartmentContoller.java
......@@ -239,6 +239,8 @@ public class DepartmentContoller extends WebBaseController{
RedisUtil.setCache("haoban-sync-department-" + wxEnterpriseId,System.currentTimeMillis());
if(StringUtils.isNotBlank(addDepartment)) {
List<DepartmentAddQO> list = JSONArray.parseArray(addDepartment, DepartmentAddQO.class);
int sort = 0;
int maxSort = list.size();
for (DepartmentAddQO departmentAddQO : list) {
String parentId = departmentAddQO.getParentId();
DepartmentDTO dto = departmentApiService.selectById(parentId);
......@@ -270,10 +272,11 @@ public class DepartmentContoller extends WebBaseController{
}else{
department.setIsStore(isStore);
}
department.setSort(departmentAddQO.getSort());
//department.setSort(departmentAddQO.getSort());
department.setLevel(dto.getLevel() + 1);
department.setRelatedId(departmentAddQO.getRelatedId());
department.setRelatedCode(storeCode);
department.setSort(maxSort - sort);
HaobanResponse hr = departmentApiService.add(department);
if(hr.getErrorCode() != 1) {
continue;
......@@ -291,6 +294,8 @@ public class DepartmentContoller extends WebBaseController{
logger.info("【部门修改】editDepartment={}",editDepartment);
if(StringUtils.isNotBlank(editDepartment)) {
List<DepartmentEditQO> list = JSONArray.parseArray(editDepartment, DepartmentEditQO.class);
int sort = 0;
int maxSort = list.size();
logger.info("【部门修改】list={}",JSON.toJSONString(list));
for (DepartmentEditQO departmentQO : list) {
String parentId = departmentQO.getParentId();
......@@ -308,7 +313,8 @@ public class DepartmentContoller extends WebBaseController{
department.setChainId(parent.getChainId() + Constant.ID_SEPARATOR + parent.getDepartmentId());
department.setChainName(parent.getChainName() + Constant.NAME_SEPARATOR + parent.getDepartmentName());
department.setLevel(parent.getLevel() + 1);
department.setSort(departmentQO.getSort());
//department.setSort(departmentQO.getSort());
department.setSort(maxSort - sort);
logger.info("【部门修改】department={}",JSON.toJSONString(department));
handerSonDepartment(departmentQO.getCurrDepartment());
......@@ -431,6 +437,8 @@ public class DepartmentContoller extends WebBaseController{
logger.info("【处理子节点】sonDepartment={},parentId={}",sonDepartment,parentId);
if(StringUtils.isNotBlank(sonDepartment)) {
List<DepartmentAddQO> list = JSONArray.parseArray(sonDepartment, DepartmentAddQO.class);
int maxSort = list.size();
int sort = 0;
for (DepartmentAddQO departmentAddQO : list) {
Integer type = departmentAddQO.getType();
Integer isStore = 0;
......@@ -460,7 +468,8 @@ public class DepartmentContoller extends WebBaseController{
department.setDepartmentName(departmentAddQO.getDepartmentName());
department.setChainId(dto.getChainId() + Constant.ID_SEPARATOR + dto.getDepartmentId());
department.setChainName(dto.getChainName() + Constant.NAME_SEPARATOR + dto.getDepartmentName());
department.setSort(departmentAddQO.getSort());
//department.setSort(departmentAddQO.getSort());
department.setSort(maxSort - sort);
department.setIsStore(departmentAddQO.getStoreFlag());
department.setLevel(dto.getLevel() + 1);
if(departmentAddQO.getStoreFlag() != null){
......
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