4 Commits 52301b4cd1 ... e1513aa761

Author SHA1 Message Date
  半月无霜 e1513aa761 Merge remote-tracking branch 'origin/master' 4 years ago
  半月无霜 381d693cfd 医生主页访问BUG修复 4 years ago
  半月无霜 d0fd0bd41c Merge branch 'master' of http://192.168.20.122:3000/root/qiyewechatApp 4 years ago
  半月无霜 19dde7825e 新增科室图标 4 years ago

+ 1 - 1
ymall/src/main/java/com/liangjian11/ymall/controller/common/WechatController.java

@@ -152,7 +152,7 @@ public class WechatController {
 //    }
 
     if (identity.equals(0)) {  //用户授权
-      if (StringUtils.isBlank(userAccount.getNickname())) {
+      if (StringUtils.isNotBlank(userAccount.getNickname())) {
         response.sendRedirect(redirectPathSource.getRedirectPath(redirectCode, userAccount, id));
         return;
       }

+ 4 - 1
ymall/src/main/resources/mapper/HospitalDeptMapper.xml

@@ -69,7 +69,10 @@
   </select>
 
 	<select id="get" resultType="map">
-		select xcdepartid AS id, departmentname AS "departmentName" from hospitaldepartments
+		select xcdepartid AS id,
+			departmentname AS "departmentName",
+			icon
+		from hospitaldepartments
 		WHERE parentid is not null AND isdelete = 'f'
 		<if test="id!=null">AND xcdepartid = #{id}</if>
 		<if test="name!=null">AND departmentname = #{name}</if>