Merge remote-tracking branch 'origin/V1' into V1

web/src/main/java/com/jpsoft/smart/modules/base/controller/MessageNoticeController.java

@@ -285,7 +285,7 @@ public class MessageNoticeController {
         }
 
         if (StringUtils.isEmpty(companyCode)){
-            if (userService.hasRole(subject,"SYSADMIN")) {
+            if (!userService.hasRole(subject,"SYSADMIN")) {
                 searchParams.put("companyIds", companyInfo.getCode().split(","));
             }
         }

web/src/main/java/com/jpsoft/smart/modules/mobile/controller/PersonDeviceFilterLogController.java

@@ -10,6 +10,7 @@ import com.jpsoft.smart.modules.common.utils.PojoUtils;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.joda.time.DateTime;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -164,11 +165,13 @@ public class PersonDeviceFilterLogController {
     @ApiOperation(value="未测量体温人员列表")
     @RequestMapping(value = "queryUnmeasureGroupList",method = RequestMethod.POST)
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "queryDate",value = "查询日期(yyyy-MM-dd)", paramType = "form",dataType = "String"),
+            @ApiImplicitParam(name="companyId",value = "公司编号",required = false,paramType = "form"),
+            @ApiImplicitParam(name = "queryDate",value = "查询日期(yyyy-MM-dd)",required = true, paramType = "form"),
             @ApiImplicitParam(name="token",value = "令牌",required = true,paramType = "form"),
             @ApiImplicitParam(name="subject",value = "目标(不传)",paramType = "form")
     })
     public MessageResult<List> queryUnmeasureGroupList(
+            String companyId,
             @DateTimeFormat(pattern = "yyyy-MM-dd") Date queryDate,
             @RequestAttribute String subject,
             String token){
@@ -176,7 +179,12 @@ public class PersonDeviceFilterLogController {
 
         try{
             PersonInfo personInfo = personInfoService.get(Long.valueOf(subject));
-            CompanyInfo companyInfo = companyInfoService.get(personInfo.getCompanyId());
+
+            if (StringUtils.isEmpty(companyId)){
+                companyId = personInfo.getCompanyId();
+            }
+
+            CompanyInfo companyInfo = companyInfoService.get(companyId);
 
             String[] arr = companyInfo.getCode().split(",");