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

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

@@ -277,6 +277,7 @@ public class DepartmentContoller extends WebBaseController{
 				unBindDTO.setRelatedId(departmentDTO.getId());
 				unBindDTO.setIsStore(departmentDTO.getType());
 				unBindDTO.setDepartmentName(departmentDTO.getName());
+				unBindDTO.setDepartmentId(departmentDTO.getId());
 				dtoList.add(unBindDTO);
 			}
 		}

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

@@ -75,8 +75,8 @@ 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);
+	public HaobanResponse staffList(String departmentId,Integer activeFlag,String keyWord,BasePageInfo pageInfo){
+		Page<StaffDTO> page = staffApiService.pageStaff(departmentId,activeFlag,keyWord,pageInfo);
 		List<StaffDTO> list = page.getResult();
 		if(list != null) {
 			for (StaffDTO staffDTO : list) {

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

@@ -40,9 +40,9 @@ public class WxEnterpriseController extends WebBaseController{
 	@IgnoreLogin
 	@RequestMapping("wx-enterprise-list")
 	public HaobanResponse wxEnterpriseList() {
-		String wxEnterpriseId = "123456";
-//		LoginVO login = (LoginVO) AuthRequestUtil.getSessionUser();
-//		String wxEnterpriseId = login.getWxEnterpriseId();
+//		String wxEnterpriseId = "123456";
+		LoginVO login = (LoginVO) AuthRequestUtil.getSessionUser();
+		String wxEnterpriseId = login.getWxEnterpriseId();
 		List<EnterpriseDetailDTO> list = wxEnterpriseRelatedApiService.listEnterpriseByWxEnterpriseId(wxEnterpriseId);
 		if(CollectionUtil.isNotEmpty(list)){
 			List<String> enterpriseIds = list.stream().map(s->s.getEnterpriseId()).collect(Collectors.toList());
@@ -76,6 +76,11 @@ public class WxEnterpriseController extends WebBaseController{
 	
 	@RequestMapping("wx-enterprise-bind")
 	public HaobanResponse wxEnterpriseBind(String enterpriseId,String wxEnterpriseId,String version) {
+		if(org.apache.commons.lang3.StringUtils.isAnyBlank(enterpriseId,version)){
+			return resultResponse(HaoBanErrCode.ERR_2);
+		}
+		LoginVO login = (LoginVO) AuthRequestUtil.getSessionUser();
+		wxEnterpriseId = login.getWxEnterpriseId();
 		int i = wxEnterpriseRelatedApiService.wxEnterpriseBind(enterpriseId,wxEnterpriseId,version);
 		if(i==1){
 			return resultResponse(HaoBanErrCode.ERR_10006);