Compare commits
2
Commits
0fed763499
...
c6338a8d45
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c6338a8d45 | ||
|
|
66795541c0 |
+1
-1
@@ -12,7 +12,7 @@
|
||||
aem.host_model as hostModel,
|
||||
aem.host_serial_num as hostSerialNum,
|
||||
aem.battery_life as batteryLife,
|
||||
aem."status" AS STATUS,
|
||||
aem.status AS STATUS,
|
||||
aem.control_org_name AS controlDept,
|
||||
aem.manage_user_name AS custodian,
|
||||
aem.manage_user_mobile AS custodianTel,
|
||||
|
||||
+3
-1
@@ -115,7 +115,9 @@ public class WearingDetailTransfer {
|
||||
return Optional.ofNullable(this.departMap.get(orgCode))
|
||||
.orElseGet(() -> {
|
||||
SysDepart sysDepart = SpringContextUtils.getBean(ISysCache.class).getDepartByOrgCode(orgCode);
|
||||
this.departMap.put(orgCode, sysDepart);
|
||||
if (sysDepart != null) {
|
||||
this.departMap.put(orgCode, sysDepart);
|
||||
}
|
||||
return sysDepart;
|
||||
});
|
||||
}
|
||||
|
||||
+1
-1
@@ -160,7 +160,7 @@
|
||||
) where rn = 1)
|
||||
where wd.userid = #{userid,jdbcType=VARCHAR}
|
||||
and wd.watch_no = #{watchNo,jdbcType=VARCHAR}
|
||||
and wd."type" = 1;
|
||||
and wd.type = 1;
|
||||
</update>
|
||||
|
||||
<insert id="insertSpo2">
|
||||
|
||||
Reference in New Issue
Block a user