update code bug v1 20230509

cjy-project/src/main/resources/mapper/emergencycommand/AlarmInfoMapper.xml

@@ -134,7 +134,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="classificationDataCode != null  and classificationDataCode != ''">and t1.classification_data_code =
                 #{classificationDataCode}
             </if>
-            <if test="alarmSource != null and alarmSource != ''">alarm_source = #{alarmSource},</if>
+            <if test="alarmSource != null and alarmSource != ''">and t1.alarm_source = #{alarmSource},</if>
             <if test="type != null  and type != ''">and t1.type in(${type})</if>
             <if test="organCode != null ">and t1.organ_code = #{organCode}</if>
             <if test="status != null "> and t1.status = #{status}</if>
@@ -194,7 +194,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="organCode != null ">and t1.organ_code = #{organCode}</if>
         <if test="startTime != null">and t1.create_time >= #{startTime}</if>
         <if test="endTime != null">and t1.create_time &lt;= #{endTime}</if>
-        <if test="alarmSource != null and alarmSource != ''">alarm_source = #{alarmSource},</if>
+        <if test="alarmSource != null and alarmSource != ''">and t1.alarm_source = #{alarmSource}</if>
         <if test="classificationEventCode != null">and t6.code = #{classificationEventCode}</if>
         <if test="eventGradeId != null">and t1.event_grade_id = #{eventGradeId}</if>
         </where>
@@ -230,13 +230,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
             <if test="type != null  and type != ''"> and t1.type = #{type}</if>
             <if test="organCode != null "> and t1.organ_code = #{organCode}</if>
-            <if test="alarmSource != null and alarmSource != ''"> and alarm_source = #{alarmSource},</if>
+            <if test="alarmSource != null and alarmSource != ''"> and t1.alarm_source = #{alarmSource}</if>
             <if test="classificationEventCode != null"> and t1.classification_event_code = #{classificationEventCode}</if>
             <if test="eventGradeId != null"> and t1.event_grade_id = #{eventGradeId}</if>
         </where>
     </select>
     <select id="selectExerciseInfoById" resultType="ExerciseInfoVO">
-        select id, title, classification_data_code as classificationDataCode, contact_user, phone, longitude, latitude, description
+        select id, title, classification_data_code as classificationDataCode, contact_user as contactUser, phone, longitude, latitude, description
         from ec_alarm_info
         where del_flag !=2 and id = #{id}
     </select>
@@ -257,7 +257,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="type != null  and type != ''"> and t1.type = #{type}</if>
         <if test="type == null  or type == ''"> and t1.type != 2</if>
         <if test="organCode != null "> and t1.organ_code = #{organCode}</if>
-        <if test="alarmSource != null and alarmSource != ''"> and alarm_source = #{alarmSource}</if>
+        <if test="alarmSource != null and alarmSource != ''"> and t1.alarm_source = #{alarmSource}</if>
         </where>
     </select>
     <select id="selectAlarmStatisticsByStatus" resultType="com.cjy.emergencycommand.domain.vo.AlarmStatisticsVO">

ruoyi-ui/vue.config.js

@@ -35,7 +35,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://localhost:8080/`,//用户名:admin 密码CJYjqgk@2023!
+        target: `http://localhost:9998/`,//用户名:admin 密码CJYjqgk@2023!
         // target: `http://39.105.17.128:8096/`,//用户名:cjyadmin/密码:CJYjqgk@2023!
         // target: `http://192.168.0.229:8080/`,//用户名:admin 密码Cjy@123abc
         changeOrigin: true,