Commit a6b4628f by huluobin

bug fix

parent 7df40bfe
...@@ -36,7 +36,11 @@ public class TechScoreRulesServiceImpl extends ServiceImpl<TechScoreRulesMapper, ...@@ -36,7 +36,11 @@ public class TechScoreRulesServiceImpl extends ServiceImpl<TechScoreRulesMapper,
.eq(Career::getTechnicianId, technicianId)); .eq(Career::getTechnicianId, technicianId));
TechScore techScore = new TechScore(); TechScore techScore = new TechScore();
techScore.setTechScoreRulesList(techScoreRulesList); techScore.setTechScoreRulesList(techScoreRulesList);
techScore.setTechScore(career.getTechScore()); if (career != null) {
techScore.setTechScore(career.getTechScore());
} else {
techScore.setTechScore(0);
}
return techScore; return techScore;
} }
} }
...@@ -25,7 +25,7 @@ import java.util.Enumeration; ...@@ -25,7 +25,7 @@ import java.util.Enumeration;
@Slf4j @Slf4j
public class RRExceptionHandler { public class RRExceptionHandler {
@Value("${spring.profiles}") @Value("${spring.profiles.active}")
private String profile; private String profile;
@Resource @Resource
......
...@@ -54,6 +54,17 @@ spring: ...@@ -54,6 +54,17 @@ spring:
min-idle: 0 min-idle: 0
timeout: 60000ms timeout: 60000ms
mail:
host: smtp.qq.com
username: robbendev@qq.com
password: hccmfwhgcrnccagh
properties:
mail:
smtp:
auth: true
starttls:
enable: true
required: true
#项目属性 #项目属性
gogirl: gogirl:
......
...@@ -55,6 +55,17 @@ spring: ...@@ -55,6 +55,17 @@ spring:
min-idle: 0 min-idle: 0
timeout: 60000ms timeout: 60000ms
mail:
host: smtp.qq.com
username: robbendev@qq.com
password: hccmfwhgcrnccagh
properties:
mail:
smtp:
auth: true
starttls:
enable: true
required: true
#项目属性 #项目属性
gogirl: gogirl:
......
...@@ -54,6 +54,17 @@ spring: ...@@ -54,6 +54,17 @@ spring:
min-idle: 0 min-idle: 0
timeout: 60000ms timeout: 60000ms
mail:
host: smtp.qq.com
username: robbendev@qq.com
password: hccmfwhgcrnccagh
properties:
mail:
smtp:
auth: true
starttls:
enable: true
required: true
#项目属性 #项目属性
gogirl: gogirl:
......
spring: spring:
profiles: profiles:
active: prod active: pre
servlet: servlet:
#文件上传最大容量 #文件上传最大容量
multipart: multipart:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment