Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer

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

@@ -193,6 +193,7 @@ public class MessageApiServiceImpl implements MessageApiService {
                 String response = this.departmentService.add(departmentDTO);
                 log.info("微信同步新增部门：{}", JSON.toJSONString(response));
             }else {
+            	departmentDTO.setIsStore(department.getIsStore());
                 departmentDTO.setDepartmentId(department.getDepartmentId());
                 this.departmentService.edit(departmentDTO);
                 log.info("企业微信更新同步完成");

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

@@ -36,6 +36,8 @@ import com.gic.haoban.manage.web.auth.AuthRequestUtil;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.haoban.manage.web.vo.LoginVO;
 import com.gic.haoban.manage.web.vo.StoreVo;
+import com.gic.wechat.api.service.qywx.QywxCorpApiService;
+import com.gic.wechat.api.service.qywx.QywxSuiteApiService;
 
 @RestController
 public class WxEnterpriseController extends WebBaseController{
@@ -49,6 +51,8 @@ public class WxEnterpriseController extends WebBaseController{
 	private DepartmentApiService departmentApiService;
 	@Autowired
 	private StoreService storeService;
+	@Autowired
+	private QywxCorpApiService qywxCorpApiService;
 	
 	//授权企业列表
 	@HttpLimit
@@ -85,6 +89,19 @@ public class WxEnterpriseController extends WebBaseController{
 		WxEnterpriseDTO wxEnterpriseDTO = wxEnterpriseApiService.getOne(wxEnterpriseId);
 		return resultResponse(HaoBanErrCode.ERR_1,wxEnterpriseDTO);
 	}
+	
+	//企业信息
+	@IgnoreLogin
+	@RequestMapping("wxEnterprise-refresh")
+	public HaobanResponse enterpriseRefresh(String wxEnterpriseId) {
+		if(StringUtils.isEmpty(wxEnterpriseId)){
+			return resultResponse(HaoBanErrCode.ERR_1);
+		}
+		//qywxCorpApiService.
+		WxEnterpriseDTO wxEnterpriseDTO = wxEnterpriseApiService.getOne(wxEnterpriseId);
+		
+		return resultResponse(HaoBanErrCode.ERR_1,wxEnterpriseDTO);
+	}
 	//gic企业列表
 	@IgnoreLogin
 	@RequestMapping("enterprise-search")