Commit 51d36c055f0fc31bb3dd3c80adbe2fdd19e97199
Exists in
master
and in
1 other branch
Merge remote-tracking branch 'origin/master'
Showing 2 changed files
platform-biz-service/src/main/resources/mainOrm/Users.xml
View file @
51d36c0
| ... | ... | @@ -107,12 +107,12 @@ |
| 107 | 107 | |
| 108 | 108 | |
| 109 | 109 | <select id="getUsers" resultMap="UsersResultMap" parameterType="java.lang.Integer"> |
| 110 | -select id,logincenter_id,type,org_id,dept_id,name,account,pwd,phone,publish_id,publish_name,yn,enable,modified,created,remarks,last_login_time, ks_id,foreign_id,other_account | |
| 110 | +select id,logincenter_id,type,org_id,dept_id,name,account,pwd,phone,publish_id,publish_name,yn,enable,modified,created,remarks,last_login_time, ks_id,foreign_id,other_account,zhiChenId | |
| 111 | 111 | from users where id = #{id,jdbcType=INTEGER} |
| 112 | 112 | </select> |
| 113 | 113 | |
| 114 | 114 | <select id="getUsersByLoginCenterId" resultMap="UsersResultMap" parameterType="java.lang.Integer"> |
| 115 | - select id,logincenter_id,type,org_id,dept_id,name,account,pwd,phone,publish_id,publish_name,yn,enable,modified,created,remarks,last_login_time, ks_id,foreign_id,other_account | |
| 115 | + select id,logincenter_id,type,org_id,dept_id,name,account,pwd,phone,publish_id,publish_name,yn,enable,modified,created,remarks,last_login_time, ks_id,foreign_id,other_account,zhiChenId | |
| 116 | 116 | from users where logincenter_id = #{id,jdbcType=INTEGER} and enable =1 order by last_login_time desc |
| 117 | 117 | </select> |
| 118 | 118 | |
| ... | ... | @@ -197,7 +197,7 @@ |
| 197 | 197 | <select id="queryUsers" resultMap="UsersResultMap" parameterType="com.lyms.platform.permission.model.UsersQuery"> |
| 198 | 198 | select |
| 199 | 199 | id,logincenter_id,type,org_id,dept_id,name,account,pwd,phone,publish_id,publish_name,yn,enable,modified,created,remarks,last_login_time, |
| 200 | - ks_id,foreign_id,other_account | |
| 200 | + ks_id,foreign_id,other_account,zhiChenId | |
| 201 | 201 | from users |
| 202 | 202 | <include refid="UsersCondition"/> |
| 203 | 203 | <include refid="orderAndLimit"/> |
| ... | ... | @@ -207,7 +207,7 @@ |
| 207 | 207 | <select id="queryUsers2" resultMap="UsersResultMap" parameterType="com.lyms.platform.permission.model.UsersQuery"> |
| 208 | 208 | select DISTINCT u.id |
| 209 | 209 | id,logincenter_id,type,org_id,dept_id,name,account,pwd,phone,publish_id,publish_name,u.yn,enable,modified,created,remarks,last_login_time, |
| 210 | - ks_id,foreign_id,other_account | |
| 210 | + ks_id,foreign_id,other_account,zhiChenId | |
| 211 | 211 | from users u LEFT JOIN user_role_maps ur |
| 212 | 212 | on u.id = ur.user_id |
| 213 | 213 | where 1=1 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
View file @
51d36c0
| ... | ... | @@ -233,7 +233,7 @@ |
| 233 | 233 | Map<String, String> checkRecord = new HashMap<>(); |
| 234 | 234 | Date checkDate = cmodel.getCheckDate(); |
| 235 | 235 | String monthAge = ""; |
| 236 | - if(babyBirth == null || checkDate == null) | |
| 236 | + if(babyBirth != null && checkDate != null) | |
| 237 | 237 | { |
| 238 | 238 | monthAge = DateUtil.getBabyMonthAge(babyBirth, checkDate); |
| 239 | 239 | } |