修改机器人账号

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml

@@ -935,7 +935,8 @@ LEFT JOIN (
     <select id="queryByUserId" resultType="com.yeejoin.amos.boot.module.common.api.entity.OrgUsr">
         SELECT *
         FROM cb_org_usr
-        WHERE is_delete = 0
+        WHERE (is_delete = 0
+        or org_expand_attr8=1)
         <if test="userId != null">
             AND amos_org_id = #{userId}
         </if>

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -2251,9 +2251,10 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	private List<OrgUsr> getUsrList(String userId) {
 		// 获取登陆人角色
 		LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
-		wrapper.eq(OrgUsr::getIsDelete, false);
 		wrapper.eq(OrgUsr::getAmosOrgId, userId);
-		wrapper.eq(OrgUsr::getBizOrgType, OrgPersonEnum.人员.getKey());
+		wrapper.eq(OrgUsr::getBizOrgType, OrgPersonEnum.人员.getKey()).and(rapper->
+				rapper.eq(OrgUsr::getIsDelete, false).or().eq(OrgUsr::getOrgExpandAttr8, "1")
+		);
 		List<OrgUsr> orgUsrList = this.baseMapper.selectList(wrapper);
 		return orgUsrList;
 	}

amos-boot-system-jcs/src/main/java/com/yeejoin/amos/AmosJcsApplication.java

@@ -54,7 +54,7 @@ public class AmosJcsApplication {
 		String port = env.getProperty("server.port");
 		String path = oConvertUtils.getString(env.getProperty("server.servlet.context-path"));
 		GlobalExceptionHandler.setAlwaysOk(true);
-        String logs=String.format("%n----------------------------------------------------------%n Application Amos-Biz-Boot is running! Access URLs:%n Swagger文档: http:// %s : %s  %s /doc.html%n----------------------------------------------------------",ip,port,path);
+        String logs=String.format("%n----------------------------------------------------------%n Application Amos-Biz-Boot is running! Access URLs:%n Swagger文档: http://%s:%s%s/doc.html%n----------------------------------------------------------",ip,port,path);
 		logger.info( logs);
 	}