Merge branch 'master_xgh_pendingid' into 'developer'

test

See merge request !293

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

@@ -125,6 +125,8 @@ public class StaffDepartmentRelatedServiceImpl implements StaffDepartmentRelated
 	    if(params.contains("#")) {
 	        addDay = Integer.parseInt(params.split("#")[0]) ;
 	        wxEnterpriseId =  params.split("#")[1] ;
+	    }else {
+	        addDay = Integer.parseInt(params) ;
 	    }
 	    Date addDate = DateUtil.addDay(DateUtil.getStartTimeOfDay(),-addDay) ;
 	    List<String> list = this.mapper.listNoDepartStaff(wxEnterpriseId, addDate) ;