Merge remote-tracking branch 'origin/master' into matser

fs-admin/src/main/java/com/fs/his/controller/FsUserController.java

@@ -342,6 +342,7 @@ public class FsUserController extends BaseController
     public R listBySearch(FsUser user)
     {
         if (Objects.nonNull(user) && StringUtils.isNotBlank(user.getPhone())){
+            user.setPhoneUnencrypted(user.getPhone());
             user.setPhone(PhoneUtil.encryptPhone(user.getPhone()));
         }
         List<FsUser> list = fsUserService.selectFsUserList(user);

fs-ipad-task/src/main/resources/logback.xml

@@ -21,7 +21,7 @@
             <!-- 日志文件名格式 -->
 			<fileNamePattern>${log.path}/sys-info.%d{yyyy-MM-dd}.log</fileNamePattern>
 			<!-- 日志最大的历史 60天 -->
-			<maxHistory>60</maxHistory>
+			<maxHistory>6</maxHistory>
 		</rollingPolicy>
 		<encoder>
 			<pattern>${log.pattern}</pattern>
@@ -43,7 +43,7 @@
             <!-- 日志文件名格式 -->
             <fileNamePattern>${log.path}/sys-error.%d{yyyy-MM-dd}.log</fileNamePattern>
 			<!-- 日志最大的历史 60天 -->
-			<maxHistory>60</maxHistory>
+			<maxHistory>6</maxHistory>
         </rollingPolicy>
         <encoder>
             <pattern>${log.pattern}</pattern>
@@ -65,7 +65,7 @@
             <!-- 按天回滚 daily -->
             <fileNamePattern>${log.path}/sys-user.%d{yyyy-MM-dd}.log</fileNamePattern>
             <!-- 日志最大的历史 60天 -->
-            <maxHistory>60</maxHistory>
+            <maxHistory>6</maxHistory>
         </rollingPolicy>
         <encoder>
             <pattern>${log.pattern}</pattern>

fs-service/src/main/java/com/fs/his/domain/FsUser.java

@@ -43,6 +43,10 @@ public class FsUser extends BaseEntity
     /** 手机号码 */
     @Excel(name = "手机号码")
     private String phone;
+
+    /** 不加密手机号 */
+    private String phoneUnencrypted;
+
     private BigDecimal nowMoney;
     private BigDecimal brokeragePrice;
 

fs-service/src/main/resources/mapper/his/FsUserMapper.xml

@@ -62,7 +62,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userId != null">and user_id = #{userId}</if>
             <if test="nickName != null  and nickName != ''"> and nick_name like concat( #{nickName}, '%')</if>
             <if test="avatar != null  and avatar != ''"> and avatar = #{avatar}</if>
-            <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
+            <if test="phone != null  and phone != '' and phoneUnencrypted != null and phoneUnencrypted != ''">
+                and (phone = #{phone} or phone = #{phoneUnencrypted})
+            </if>
             <if test="integral != null "> and integral = #{integral}</if>
             <if test="signNum != null "> and sign_num = #{signNum}</if>
             <if test="status != null "> and status = #{status}</if>

fs-user-app/src/main/java/com/fs/app/controller/DoctorArticleController.java

@@ -43,6 +43,7 @@ public class DoctorArticleController extends  AppBaseController {
     public R getArticleCateList(){
         FsDoctorArticleCate map=new FsDoctorArticleCate();
         map.setIsDel(0);
+        map.setStatus(1);
         List<FsDoctorArticleCate> list=articleCateService.selectFsDoctorArticleCateList(map);
         return R.ok().put("data",list);
     }