From 869edb425d2e931d756c756c16ee5b3f42ee027a Mon Sep 17 00:00:00 2001
From: zf <1603559716@qq.com>
Date: 星期五, 04 八月 2023 13:49:20 +0800
Subject: [PATCH] bug修改
---
src/main/java/com/gk/hotwork/Mapper/mybatis/InspectionHiddenDangerMapper.xml | 3 ++-
src/main/java/com/gk/hotwork/Service/ServiceImpl/SafetySelfInspectionImpl.java | 2 +-
src/main/java/com/gk/hotwork/Controller/LoginController.java | 16 ++++++++++++----
3 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/gk/hotwork/Controller/LoginController.java b/src/main/java/com/gk/hotwork/Controller/LoginController.java
index bb66f16..ea98050 100644
--- a/src/main/java/com/gk/hotwork/Controller/LoginController.java
+++ b/src/main/java/com/gk/hotwork/Controller/LoginController.java
@@ -9,11 +9,8 @@
import com.gk.hotwork.Config.Oauth2.IRedisService;
import com.gk.hotwork.Config.Oauth2.OauthRole;
import com.gk.hotwork.Config.Oauth2.RedisKeyEnum;
-import com.gk.hotwork.Domain.AuthorizationInfo;
-import com.gk.hotwork.Domain.ExamScoreInfo;
+import com.gk.hotwork.Domain.*;
import com.gk.hotwork.Domain.Exception.BusinessException;
-import com.gk.hotwork.Domain.UserFace;
-import com.gk.hotwork.Domain.UserInfo;
import com.gk.hotwork.Domain.Utils.CommonUtil;
import com.gk.hotwork.Domain.Utils.Msg;
import com.gk.hotwork.Domain.Vo.ExamScoreVo;
@@ -48,6 +45,9 @@
ExamScoreService examScoreService;
@Autowired
UserFaceService userFaceService;
+ @Autowired
+ CompanyService companyService;
+
@Value("${host}")
private String host;
@Value("${workname}")
@@ -118,6 +118,14 @@
UserFace userFace = userFaceService.selectByUserId(user.getId());
if (userFace != null)
user.setCode(userFace.getCode());
+ if(user.getCompanyid() != null){
+ CompanyInfo companyInfo = companyService.getById(user.getId());
+ if(companyInfo != null){
+ user.setProvince(companyInfo.getProvince());
+ user.setCity(companyInfo.getCity());
+ user.setCounty(companyInfo.getArea());
+ }
+ }
msg.setResult(user);
} catch (Exception e) {
e.printStackTrace();
diff --git a/src/main/java/com/gk/hotwork/Mapper/mybatis/InspectionHiddenDangerMapper.xml b/src/main/java/com/gk/hotwork/Mapper/mybatis/InspectionHiddenDangerMapper.xml
index f07b5af..4c53600 100644
--- a/src/main/java/com/gk/hotwork/Mapper/mybatis/InspectionHiddenDangerMapper.xml
+++ b/src/main/java/com/gk/hotwork/Mapper/mybatis/InspectionHiddenDangerMapper.xml
@@ -3,6 +3,7 @@
<mapper namespace="com.gk.hotwork.Mapper.InspectionHiddenDangerMapper" >
<update id="delByInspectionItemId">
update inspection_hidden_danger set valid_flag = 0 , update_time = #{inspectionHiddenDanger.updateTime},update_by = #{inspectionHiddenDanger.updateBy}
+ where self_inspection_item_id = #{inspectionHiddenDanger.selfInspectionItemId}
</update>
<update id="delByIds">
@@ -77,7 +78,7 @@
<if test="params.area != null and params.area != ''" >
and co.area = #{params.area}
</if>
- ORDER BY l.create_time
+ ORDER BY l.create_time desc
</select>
<select id="inspectionHdangerlist" resultType="com.gk.hotwork.Domain.InspectionHiddenDanger">
SELECT
diff --git a/src/main/java/com/gk/hotwork/Service/ServiceImpl/SafetySelfInspectionImpl.java b/src/main/java/com/gk/hotwork/Service/ServiceImpl/SafetySelfInspectionImpl.java
index 2dc28f5..d37efdd 100644
--- a/src/main/java/com/gk/hotwork/Service/ServiceImpl/SafetySelfInspectionImpl.java
+++ b/src/main/java/com/gk/hotwork/Service/ServiceImpl/SafetySelfInspectionImpl.java
@@ -630,7 +630,7 @@
//否决 合格--删除扣分记录
safetySelfInspectionItemDeductionMapper.delBySafetySelfInspectionItemId(param.getId(),username,date);
//删除隐患
- dangerService.delByInspectionItemId(param.getSafetyInspectionItemId(),user);
+ dangerService.delByInspectionItemId(param.getId(),user);
//删除附件
attachmentInfoService.deleteByBusinessId(param.getId());
}else{
--
Gitblit v1.9.2