Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev

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();

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"

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());
+    }
+
 }

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();
 }
 

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();
 }

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();
+    }
 }

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>

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">