2 커밋 94264dfd35 ... 8fc03b3518

작성자 SHA1 메시지 날짜
  devops 8fc03b3518 用户权限调整 3 달 전
  devops 2cbed895ce 严禁处理涉密信息 4 달 전

+ 3 - 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java

@@ -76,7 +76,7 @@ public class SysLoginController extends BaseController
         return "login";
     }
 
-    @PostMapping("/login")
+/*    @PostMapping("/login")
     @ResponseBody
     public AjaxResult ajaxLogin(String username, String password, Boolean rememberMe)
     {
@@ -96,7 +96,7 @@ public class SysLoginController extends BaseController
             }
             return error(msg);
         }
-    }
+    }*/
 
     /**
      * 发送短信验证码
@@ -156,6 +156,7 @@ public class SysLoginController extends BaseController
 
             if (sendResult)
             {
+                System.out.println(smsCode);
                 // 记录发送日志,不需要记录日志
                 //AsyncManager.me().execute(AsyncFactory.recordLogininfor(phone, Constants.LOGIN_SUCCESS, "短信验证码发送成功"));
                 return success("验证码发送成功");

+ 2 - 2
ruoyi-admin/src/main/resources/mapper/project/TrsFileInfoMapper.xml

@@ -20,8 +20,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectTrsFileInfoVo"/>
         <if test="params.dataScope != null and params.dataScope != ''">
             <!-- 添加部门表关联 -->
-            --             LEFT JOIN sys_dept d ON t.dept_id = d.dept_id
-            LEFT JOIN sys_user d ON t.user_id = d.user_id
+            LEFT JOIN sys_dept d ON t.dept_id = d.dept_id
+            LEFT JOIN sys_user u ON t.user_id = u.user_id
         </if>
         <where>
             <if test="docname != null  and docname != ''"> and docname like concat('%', #{docname}, '%')</if>

+ 2 - 0
ruoyi-admin/src/main/resources/mapper/project/TrsPolicyWordsMapper.xml

@@ -35,6 +35,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="params.dataScope != null and params.dataScope != ''">
             <!-- 添加部门表关联 -->
             LEFT JOIN sys_dept d ON t.dept_id = d.dept_id
+            LEFT JOIN sys_user u ON t.user_id = u.user_id
+
         </if>
         <where>  
             <if test="wrongWord != null  and wrongWord != ''"> and wrong_word like concat('%', #{wrongWord}, '%')</if>

+ 3 - 0
ruoyi-admin/src/main/resources/mapper/project/TrsSensitiveWordsMapper.xml

@@ -43,6 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="params.dataScope != null and params.dataScope != ''">
             <!-- 添加部门表关联 -->
             LEFT JOIN sys_dept d ON t.dept_id = d.dept_id
+            LEFT JOIN sys_user u ON t.user_id = u.user_id
         </if>
         <where>  
             <if test="wrongWord != null  and wrongWord != ''"> and wrong_word like concat('%', #{wrongWord}, '%')</if>
@@ -95,6 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="params.dataScope != null and params.dataScope != ''">
             <!-- 添加部门表关联 -->
             LEFT JOIN sys_dept d ON t.dept_id = d.dept_id
+            LEFT JOIN sys_user u ON t.user_id = u.user_id
         </if>
         <where>
             and flag = 0
@@ -110,6 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="params.dataScope != null and params.dataScope != ''">
             <!-- 添加部门表关联 -->
             LEFT JOIN sys_dept d ON t.dept_id = d.dept_id
+            LEFT JOIN sys_user u ON t.user_id = u.user_id
         </if>
         where id = #{id}
         <!-- 数据范围过滤 -->

+ 6 - 0
ruoyi-admin/src/main/resources/templates/login.html

@@ -218,9 +218,15 @@
             <div class="login-form-container">
                 <!-- 短信登录表单 - 当 smsLoginEnabled 为 true 时显示 -->
                 <form id="smsLoginForm" th:if="${smsLoginEnabled}" autocomplete="on">
+                    <!-- 新增:涉密信息警告提示 -->
+                    <div class="security-warning" style="color: #ff4d4f; font-weight: bold; text-align: left; margin-bottom: 15px; font-size: 14px;">
+                        ⚠️ 严禁处理涉密信息
+                    </div>
                     <h3 class="form-title">短信验证码登录</h3>
                     <p class="form-subtitle">安全便捷,一键登录</p>
 
+
+
                     <div class="smart-input-group">
                         <i class="fa fa-mobile"></i>
                         <input type="text" name="phone" id="phone" class="form-control smart-input"

+ 41 - 0
ruoyi-admin/src/main/resources/templates/main.html

@@ -327,6 +327,47 @@
 
 		<!-- 结果面板区域 -->
 		<div class="col-sm-4" id="resultsPanel">
+			<!-- 新增:独立的安全警告模块 -->
+			<div class="security-alert-panel" style="
+        background: linear-gradient(135deg, #fff5f5, #ffe6e6);
+        border: 2px solid #ff4d4f;
+        border-radius: 8px;
+        margin-bottom: 15px;
+        padding: 15px;
+        box-shadow: 0 3px 10px rgba(255, 77, 79, 0.2);
+    ">
+				<div style="
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            gap: 10px;
+        ">
+					<i class="fa fa-exclamation-triangle" style="
+                color: #ff4d4f;
+                font-size: 20px;
+                flex-shrink: 0;
+            "></i>
+					<div style="
+                color: #ff4d4f;
+                font-weight: bold;
+                font-size: 15px;
+                text-align: center;
+                line-height: 1.4;
+            ">
+						严禁处理涉密信息<br>
+						<span style="
+                    font-size: 12px;
+                    font-weight: normal;
+                    color: #d9363e;
+                    margin-top: 3px;
+                    display: block;
+                ">
+                </span>
+					</div>
+				</div>
+			</div>
+
+
 			<div class="ibox float-e-margins fixed-result-panel">
 				<div class="ibox-title">
 					<h5>校对结果</h5>

+ 41 - 0
ruoyi-admin/src/main/resources/templates/project/jiaodui/edit.html

@@ -327,6 +327,47 @@
 
         <!-- 结果面板区域 -->
         <div class="col-sm-4" id="resultsPanel">
+            <!-- 新增:独立的安全警告模块 -->
+            <div class="security-alert-panel" style="
+        background: linear-gradient(135deg, #fff5f5, #ffe6e6);
+        border: 2px solid #ff4d4f;
+        border-radius: 8px;
+        margin-bottom: 15px;
+        padding: 15px;
+        box-shadow: 0 3px 10px rgba(255, 77, 79, 0.2);
+    ">
+                <div style="
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            gap: 10px;
+        ">
+                    <i class="fa fa-exclamation-triangle" style="
+                color: #ff4d4f;
+                font-size: 20px;
+                flex-shrink: 0;
+            "></i>
+                    <div style="
+                color: #ff4d4f;
+                font-weight: bold;
+                font-size: 15px;
+                text-align: center;
+                line-height: 1.4;
+            ">
+                        严禁处理涉密信息<br>
+                        <span style="
+                    font-size: 12px;
+                    font-weight: normal;
+                    color: #d9363e;
+                    margin-top: 3px;
+                    display: block;
+                ">
+                </span>
+                    </div>
+                </div>
+            </div>
+
+
             <div class="ibox float-e-margins fixed-result-panel">
                 <div class="ibox-title">
                     <h5>校对结果</h5>