bugxiugai

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/FireFightingSystemController.java

@@ -70,6 +70,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.foundation.utils.Bean;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
@@ -612,7 +613,17 @@ public class FireFightingSystemController extends AbstractBaseController {
     @ApiOperation(value = "消防系统列表查询（不分页）", notes = "下拉使用")
     @GetMapping(value = "/list")
     public List<FireFightingSystemEntity> listAll() {
-        return fireFightingSystemService.list();
+        ReginParams reginParams = getSelectedOrgInfo();
+        ReginParams.PersonIdentity personIdentity = reginParams.getPersonIdentity();
+        if (!ValidationUtil.isEmpty(personIdentity)) {
+            String bizOrgCode = personIdentity.getBizOrgCode();
+            if (StringUtils.isNotBlank(bizOrgCode)) {
+                QueryWrapper<FireFightingSystemEntity> qw = new QueryWrapper<>();
+                qw.lambda().likeRight(FireFightingSystemEntity::getBizOrgCode, bizOrgCode);
+                return fireFightingSystemService.list(qw);
+            }
+        }
+        return new ArrayList<>();
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/utils/TemplateCellWriteHandlerDate.java

@@ -72,7 +72,7 @@ public class TemplateCellWriteHandlerDate implements SheetWriteHandler {
 	            // 设置下拉单元格的首行 末行 首列 末列
 	            CellRangeAddressList rangeList = new CellRangeAddressList(1, 65536, k, k);
 	            // 如果下拉值总数大于100，则使用一个新sheet存储，避免生成的导入模板下拉值获取不到
-	            if (v.length > LIMIT_NUMBER) {
+	            if (v.length >= LIMIT_NUMBER) {
 	                //定义sheet的名称
 	                //1.创建一个隐藏的sheet 名称为 hidden + k
 	                String sheetName = "hidden" + k;