脱敏数据库bugfix

ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JProjectFundController.java

@@ -35,7 +35,7 @@ public class JProjectFundController extends BaseController {
      *
      * @return 所有数据
      */
-    @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
+    @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov,ent')")
     @ApiOperation(value = "查询该项目id下的资金情况", response = JProjectFund.class)
     @GetMapping("/{id}")
     public AjaxResult selectFund(@PathVariable Long id) {

ruoyi-admin/src/main/resources/mapper/jjh/ent/JDataScreenMapper.xml

@@ -107,6 +107,7 @@
     </select>
     <select id="getBigIndustry" resultType="com.ruoyi.jjh.ent.entity.response.JAllIndustryResponse">
         SELECT a.categories AS nameType,
+               a.categories_code,
                IFNULL(ROUND(SUM(a.year_revenue) / 10000, 1), '-') AS yearRevenue,
                IFNULL(ROUND(SUM(a.add_value), 1), '-')    AS addValue,
                IFNULL(ROUND(AVG(a.growth), 1), '-')                             AS growth,
@@ -114,7 +115,8 @@
         FROM j_medium_revenue a
         WHERE a.years = YEAR( NOW()) - 1
         GROUP BY
-            a.categories_code
+            a.categories_code,
+            a.categories
     </select>
 
 

ruoyi-admin/src/main/resources/mapper/jjh/ent/JProjectFundMapper.xml

@@ -40,7 +40,8 @@
                 project_small_type = 3 || project_small_type = 7  ) b ON a.tyshxydm = b.credit_code and SUBSTRING(a.appropriation_time, 1, 4) = b.project_year
         GROUP BY
             a.id,
-            a.fund_amount
+            a.fund_amount,
+            a.qymc, a.tyshxydm, a.project_name, a.appropriation_time, b.id
         ORDER BY
             a.fund_amount DESC
         LIMIT 5

ruoyi-admin/src/main/resources/mapper/jjh/ent/JSmartDeclarationMapper.xml

@@ -59,6 +59,9 @@
             <if test="req.userId != null and req.userId != '' ">
                 and a.zw_id = #{req.userId}
             </if>
+            <if test="req.content != null and req.content != '' ">
+                and c.alert_content  like concat('%', #{req.content}, '%')
+            </if>
             and a.alert_time &lt; NOW()
         </where>
         order by a.alert_time desc