隐患 和 验证码问题处理

inventory-dao/src/main/resources/mapper/check/BookEntHTMapper.xml

@@ -1077,7 +1077,7 @@
     sum(case when bt.HTState = '未整改' then 1 else 0 end) as 'unresolved',
     count(DISTINCT bt.BookEntHTId) dangerCount
 	from  SysOrg so
-	    left join SysEnterprise sys ON (so.OrgCode = sys.OrgCode OR so.OrgCode = sys.street_code OR so.OrgCode = sys.community_code)
+        left join SysEnterprise sys ON FIND_IN_SET(so.OrgCode ,sys.area_path)
     left join BookEntHT bt on sys.SysEnterpriseId = bt.SysEnterpriseId
     where so.SuperiorOrgCode = #{streetCode}
     <if test="null != inClass and inClass.length > 0">
@@ -1210,7 +1210,9 @@
     left join  SysEnterprise sys  on  bt.SysEnterpriseId = sys.SysEnterpriseId
     left join  SysOrg so on so.OrgCode = sys.street_code
     where sys.State = '启用'
-
+    <if test="null != streetCode and '' != streetCode">
+      and FIND_IN_SET(#{streetCode},sys.area_path)
+    </if>
     <if test="null != inClass and inClass.length > 0">
       and sys.BAseInClassId in
         <foreach collection="inClass" index="index" item="item"
@@ -1239,9 +1241,6 @@
     <if test="null != sysEnterpriseId and '' != sysEnterpriseId">
       and bt.SysEnterpriseId = #{sysEnterpriseId}
     </if>
-    <if test="null != streetCode and '' != streetCode">
-      and (sys.OrgCode = #{streetCode} or sys.street_code = #{streetCode} or sys.community_code = #{streetCode})
-    </if>
     order by bt.CreatedOn desc
 
   </select>
@@ -1554,8 +1553,9 @@
     FROM  BookEntHT  bt
         LEFT JOIN  SysEnterprise sys  ON  bt.SysEnterpriseId = sys.SysEnterpriseId
     WHERE sys.State = '启用'
-      AND (sys.OrgCode = #{streetCode} OR sys.street_code = #{streetCode}
+      <if test="null != streetCode and '' != streetCode">
-                        OR sys.community_code = #{streetCode})
+        and FIND_IN_SET(#{streetCode} ,sys.area_path)
+      </if>
       <if test="null != inClassArr and inClassArr.length > 0">
         and sys.BaseInClassId in
         <foreach collection="inClassArr" item="inClass" separator="," close=")" open="(">
@@ -1563,7 +1563,6 @@
         </foreach>
       </if>
       AND bt.`HTState` = #{hTState}
-
     <if test="null != safeClass and '' != safeClass">
       and  sys.BaseSafeClassId REGEXP  concat('(^|,)(',#{safeClass},')(,|$)')
     </if>

inventory-gov/src/main/java/com/rzyc/InventoryGovApplication.java

@@ -5,6 +5,7 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.data.mongo.MongoDataAutoConfiguration;
 import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
@@ -27,4 +28,5 @@ public class InventoryGovApplication {
         System.out.println("===========清单制政府端启动成功===========");
     }
 
+
 }

utils/src/main/java/com/common/utils/verification/Verification.java

@@ -67,7 +67,8 @@ public class Verification {
         g.dispose();
         //将验证码计算结果存入session
         verifyCode = "" + num1  + op2 + num3;
-        int result = calc(verifyCode);
+//        int result = calc(verifyCode);
+        int result = num1 + num3;
         request.getSession().setAttribute(codeKey, result);
         System.out.println("sessionID1："+request.getSession().getId());
         System.out.println("验证码结果：" + result);