fix

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/SyncJsonColumnDTO.java

+package com.gic.haoban.manage.api.dto;
+
+import java.io.Serializable;
+
+public class SyncJsonColumnDTO implements Serializable{
+	
+	private Integer fieldType;
+
+    private String name;
+
+    private boolean primary;
+
+    private String value;
+
+    public Integer getFieldType() {
+        return fieldType;
+    }
+
+    public void setFieldType(Integer fieldType) {
+        this.fieldType = fieldType;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public boolean isPrimary() {
+        return primary;
+    }
+
+    public void setPrimary(boolean primary) {
+        this.primary = primary;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+}

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/DepartmentApiService.java

@@ -89,5 +89,15 @@ public interface DepartmentApiService {
 	 * @return
 	 */
 	DepartmentDTO getRootByEnterpriseId(String wxEnterpriseId);
+	/**
+	 * gic同步
+	 * @param fieldListString
+	 */
+	void syncGicStore(String fieldListString);
+	/**
+	 * gic同步部门
+	 * @param fieldListString
+	 */
+	void syncGicDepartment(String fieldListString);
 
 }

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/StaffApiService.java

@@ -29,4 +29,6 @@ public interface StaffApiService {
 
 	public void staffEdit(StaffDTO staffDTO, String departmentIds);
 
+	public void syscGicClerk(String fieldListString);
+
 }

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

@@ -3,17 +3,22 @@ package com.gic.haoban.manage.service.service.out.impl;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.alibaba.fastjson.JSONArray;
 import com.gic.api.base.commons.Page;
 import com.gic.commons.util.EntityUtil;
 import com.gic.haoban.base.api.common.BasePageInfo;
 import com.gic.haoban.common.utils.HaobanResponse;
 import com.gic.haoban.common.utils.PageUtil;
 import com.gic.haoban.common.utils.StringUtil;
+import com.gic.haoban.contacts.manage.api.dto.SyncJsonColumnDTO;
 import com.gic.haoban.manage.api.dto.DepartmentDTO;
 import com.gic.haoban.manage.api.service.DepartmentApiService;
 import com.gic.haoban.manage.service.dao.mapper.DepartmentMapper;
@@ -26,6 +31,8 @@ import com.github.pagehelper.PageHelper;
 @Service
 public class DepartmentApiServiceImpl implements DepartmentApiService {
 	
+	private static Logger logger  = LoggerFactory.getLogger(DepartmentApiServiceImpl.class);
+	
 	@Autowired
 	private DepartmentService departmentService;
 	@Autowired
@@ -169,4 +176,30 @@ public class DepartmentApiServiceImpl implements DepartmentApiService {
 		return PageUtil.changePageHelperToCurrentPage( departmentMapper.pageFullStoreByWxEnterpriseId(wxEnterpriseId,search,count),DepartmentDTO.class);
 	}
 
+	@Override
+	public void syncGicStore(String fieldListString) {
+		logger.info("【同步门店】fieldList={}",fieldListString);
+		List<SyncJsonColumnDTO> fieldList = JSONArray.parseArray(fieldListString,SyncJsonColumnDTO.class);
+		if(fieldList.isEmpty()){
+	        return;
+	    }
+		
+		
+		for (SyncJsonColumnDTO syncJsonColumnDTO:fieldList){
+	    	String name = StringUtil.camelName(syncJsonColumnDTO.getName());
+	        String value = syncJsonColumnDTO.getValue();
+	        if("status".equals(name)) {
+	        	
+	        }
+		}
+	        
+		
+	}
+
+	@Override
+	public void syncGicDepartment(String fieldListString) {
+		// TODO Auto-generated method stub
+		
+	}
+
 }

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

@@ -15,12 +15,10 @@ import cn.hutool.core.collection.CollectionUtil;
 
 import com.gic.api.base.commons.Page;
 import com.gic.commons.util.EntityUtil;
-import com.gic.commons.util.StringUtil;
 import com.gic.haoban.base.api.common.BasePageInfo;
 import com.gic.haoban.common.utils.HaobanResponse;
 import com.gic.haoban.common.utils.PageUtil;
 import com.gic.haoban.common.utils.UuidUtil;
-import com.gic.haoban.manage.api.dto.DepartmentDTO;
 import com.gic.haoban.manage.api.dto.StaffDTO;
 import com.gic.haoban.manage.api.dto.StaffDepartmentRelatedDTO;
 import com.gic.haoban.manage.api.service.StaffApiService;

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

@@ -21,12 +21,14 @@ 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;
+import com.gic.haoban.base.api.common.PageResult;
 import com.gic.haoban.manage.web.anno.IgnoreLogin;
 import com.gic.haoban.manage.web.auth.AuthRequestUtil;
 import com.gic.haoban.common.utils.EntityUtil;
 import com.gic.haoban.common.utils.HaobanResponse;
 import com.gic.haoban.common.utils.PageUtil;
 import com.gic.haoban.manage.api.dto.DepartmentDTO;
+import com.gic.haoban.manage.api.dto.StaffDTO;
 import com.gic.haoban.manage.api.service.DepartmentApiService;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.haoban.manage.web.qo.DepartmentAddQO;
@@ -249,7 +251,13 @@ public class DepartmentContoller extends WebBaseController{
 		String wxEnterpriseId  = login.getWxEnterpriseId();
 		Integer recycleFlag = 1;
 		Page<DepartmentDTO> page = departmentApiService.pageDepartmentByParams(pageInfo,wxEnterpriseId,keyword,storeFlag,recycleFlag);
-		return resultResponse(HaoBanErrCode.ERR_1,page);
+		PageResult<DepartmentDTO> pageVo = new PageResult<>();
+        pageVo.setList(page.getResult());
+        pageVo.setPageNum(page.getCurrentPage());
+        pageVo.setPages(page.getPages());
+        pageVo.setPageSize(page.getPageSize());
+        pageVo.setTotal(page.getTotalCount());
+        return resultResponse(HaoBanErrCode.ERR_1, pageVo);
 		
 	}
 	

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

@@ -33,6 +33,12 @@ public class LoginController extends WebBaseController{
 		return resultResponse(HaoBanErrCode.ERR_1, loginVO);
 		
 	}
+	
+	@RequestMapping("get-login-qrcode")
+	public HaobanResponse getLoginQrcode(){
+		return resultResponse(HaoBanErrCode.ERR_1,"");
+		
+	}
 	//运维登录
 	@RequestMapping("yw-login")
 	public HaobanResponse login(String wxEnterpriseId) {

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

@@ -10,6 +10,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.gic.api.base.commons.Page;
 import com.gic.haoban.base.api.common.BasePageInfo;
+import com.gic.haoban.base.api.common.PageResult;
 import com.gic.haoban.common.utils.HaobanResponse;
 import com.gic.haoban.manage.api.dto.DepartmentDTO;
 import com.gic.haoban.manage.api.dto.StaffDTO;
@@ -20,6 +21,7 @@ import com.gic.haoban.manage.web.auth.AuthRequestUtil;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.haoban.manage.web.vo.LoginVO;
 
+
 @RestController
 public class StaffController extends WebBaseController{
 	
@@ -64,7 +66,13 @@ public class StaffController extends WebBaseController{
 	@RequestMapping("staff-list")
 	public HaobanResponse staffList(String departmentId,Integer activeFlag,String keyword,BasePageInfo pageInfo){
 		Page<StaffDTO> page = staffApiService.pageStaff(departmentId,activeFlag,keyword,pageInfo);
-		return resultResponse(HaoBanErrCode.ERR_1,page);
+		PageResult<StaffDTO> pageVo = new PageResult<>();
+        pageVo.setList(page.getResult());
+        pageVo.setPageNum(page.getCurrentPage());
+        pageVo.setPages(page.getPages());
+        pageVo.setPageSize(page.getPageSize());
+        pageVo.setTotal(page.getTotalCount());
+        return resultResponse(HaoBanErrCode.ERR_1, pageVo);
 	}
 	
 	@RequestMapping("staff-del")
@@ -85,6 +93,10 @@ public class StaffController extends WebBaseController{
 	@RequestMapping("staff-edit")
 	public HaobanResponse staffEdit(StaffDTO staffDTO,String departmentIds){
 		String staffId = staffDTO.getStaffId();
+		StaffDTO staff = staffApiService.selectById(staffId);
+		if(staff == null) {
+			return resultResponse(HaoBanErrCode.ERR_10006);
+		}
 		
 		staffApiService.staffEdit(staffDTO,departmentIds);
 		return resultResponse(HaoBanErrCode.ERR_1);

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/errCode/HaoBanErrCode.java

@@ -68,6 +68,7 @@ public enum HaoBanErrCode {
     ERR_10004(10004,"成员名称不能为空"),
     ERR_10005(10005,"成员已存在"),
     ERR_10006(10006,"该企业已经绑定过了"),
+    ERR_10007(10007,"成员不存在"),
 
     ERR_DEFINE(-888, "自定义错误"),
     ERR_OTHER(-999, "未知错误code");