From e370203b1302e041bbc9753d62352c0257dd6935 Mon Sep 17 00:00:00 2001
From: haha <lj7788@126.com>
Date: Thu, 10 Aug 2023 23:37:19 +0800
Subject: [PATCH] update code

---
 .../main/java/com/ruoyi/framework/aspectj/LogAspect.java | 6 +++++-
 ruoyi-ui/src/views/project/surProjectSchedule/index.vue  | 2 +-
 .../jh/bigscreen/web/controller/ProjectController.java   | 9 +++++++++
 .../com/yanzhu/jh/project/mapper/SurProjectMapper.java   | 2 ++
 .../yanzhu/jh/project/service/ISurProjectService.java    | 2 ++
 .../jh/project/service/impl/SurProjectServiceImpl.java   | 5 +++++
 .../main/resources/mapper/project/SurProjectMapper.xml   | 6 ++++++
 .../mapper/trouble/SmzSspProblemmodifyMapper.xml         | 2 +-
 8 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
index 5980eb70..a69b82bc 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
@@ -84,7 +84,11 @@ public class LogAspect
         try
         {
             // 获取当前的用户
-            LoginUser loginUser = SecurityUtils.getLoginUser();
+            LoginUser loginUser = null;
+
+            if(!SecurityUtils.getAuthentication().getPrincipal().equals("anonymousUser")) {
+                loginUser = SecurityUtils.getLoginUser();
+            }
 
             // *========数据库日志=========*//
             SysOperLog operLog = new SysOperLog();
diff --git a/ruoyi-ui/src/views/project/surProjectSchedule/index.vue b/ruoyi-ui/src/views/project/surProjectSchedule/index.vue
index 854006c0..302a92e1 100644
--- a/ruoyi-ui/src/views/project/surProjectSchedule/index.vue
+++ b/ruoyi-ui/src/views/project/surProjectSchedule/index.vue
@@ -112,7 +112,7 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200" fixed="right">
         <template slot-scope="scope">
-          <el-button
+          <el-button v-if="1==2"
             size="mini"
             type="text"
             icon="el-icon-edit"
diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectController.java
index 22ea3712..c3fd9a65 100644
--- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectController.java
+++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectController.java
@@ -44,4 +44,13 @@ public class ProjectController {
         return AjaxResult.success(list);
     }
 
+    /**
+     * 获取进度显示的项目
+     * @return
+     */
+    @GetMapping("getProgressProjects")
+    public AjaxResult getProgressProjects(){
+        return AjaxResult.success(isurProjectService.selectProgressProjects());
+    }
+
 }
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectMapper.java
index 3a3e494f..39ed4343 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectMapper.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectMapper.java
@@ -73,5 +73,7 @@ public interface SurProjectMapper
      * @return
      */
     public List<SurProject> groupByLevel(SurProject surProject);
+
+    public List<SurProject> selectProgressProjects();
 }
 
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectService.java
index 03db79a3..23bf0a4b 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectService.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectService.java
@@ -58,4 +58,6 @@ public interface ISurProjectService
      * @return 结果
      */
     public int deleteSurProjectById(Long id);
+
+    public List<SurProject> selectProgressProjects();
 }
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectServiceImpl.java
index 586668aa..73bedf9a 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectServiceImpl.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectServiceImpl.java
@@ -94,4 +94,9 @@ public class SurProjectServiceImpl implements ISurProjectService
     {
         return surProjectMapper.deleteSurProjectById(id);
     }
+
+    @Override
+    public List<SurProject> selectProgressProjects() {
+        return surProjectMapper.selectProgressProjects();
+    }
 }
diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectMapper.xml
index 659f866f..1e7941de 100644
--- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectMapper.xml
@@ -309,4 +309,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         GROUP BY dict_value,dict_label
         ) a RIGHT JOIN sys_dict_data b ON a.dict_value=b.dict_value WHERE b.dict_type='project_level'  ORDER BY cnt DESC
     </select>
+
+    <select id="selectProgressProjects"  parameterType="SurProject" resultMap="SurProjectResult">
+        <include refid="selectSurProjectVo"/>
+        where progressVisible = 0
+        order by projectSort,projectName
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml b/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml
index 176a5212..bf3cdfed 100644
--- a/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml
@@ -209,7 +209,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ) AND infotype=#{infoType}
         <if test="roleType > 0">AND roletype=#{roleType}</if>
         GROUP BY danger_type) b
-        ON a.dict_value=b.danger_type ORDER BY cnt DESC,a.dict_value
+        ON a.dict_value=b.danger_type ORDER BY cnt DESC,a.dict_value+0
     </select>
     <select id="selectSummaryByProject" parameterType="SmzSspProblemmodify" resultMap="SmzSspProblemmodifyResult">