Merge branch '20210220_sun' of sckj/mz-cloud into master

ruoyi-modules/mz-gljt/src/main/java/com/ruoyi/gljt/service/impl/GljtSqSqServiceImpl.java

@@ -87,6 +87,9 @@ public class GljtSqSqServiceImpl implements IGljtSqSqService
     @Autowired
     private GljtXmpzMapper gljtXmpzMapper;
 
+    @Autowired
+    private GljtQxpzMapper gljtQxpzMapper;
+
     /**
      * 查询高龄津贴申请信息
      *
@@ -853,7 +856,12 @@ public class GljtSqSqServiceImpl implements IGljtSqSqService
             gljtSqLrMapper.delete(new LambdaQueryWrapper<GljtSqLr>()
                     .eq(GljtSqLr::getSqrZjhm, SecurityUtils.sm4encrypt_ECB(EncryptionUtils.key, gljtSqSq.getSqrZjhm())));
         }
-        checkDbAndSw(gljtSqUtils.getQxpz(), gljtSqSq);
+        GljtQxpz pz = gljtQxpzMapper.selectOne(new LambdaQueryWrapper<GljtQxpz>()
+                .likeRight(GljtQxpz::getXzqh, gljtSqSq.getXzqh().substring(0, 6)));
+        if (ObjectUtils.isEmpty(pz)) {
+            throw new ServiceException("该地区尚未开启高龄津贴自主申报");
+        }
+        checkDbAndSw(pz, gljtSqSq);
         gljtSqSq.setId(IdUtils.simpleUUID());
         gljtSqSq.setUserId(String.valueOf(SecurityUtils.getUserId()));
         gljtSqSq.setStatus(GljtAdStatus.CG.getCode());