修改接口文档，学校改为全部存储 修改组织详情获取接口异常

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/smile/SmileShowController.java

@@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.*;
 /**
  * @author TT
  */
-@Api(tags = "学校管理")
+@Api(tags = "演出管理")
 @RestController
 @RequestMapping("/smile/show")
 public class SmileShowController {

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileOrganizationServiceImpl.java

@@ -79,7 +79,7 @@ public class SmileOrganizationServiceImpl extends ServiceImpl<SmileOrganizationM
             smileOrganization.setUpdatedDate(LocalDateTime.now());
             smileOrganization.setDelTag(0);
             smileOrganizationMapper.insert(smileOrganization);
-            return  AjaxResult.success();
+            return AjaxResult.success();
         }
         return AjaxResult.warn("已添加");
     }
@@ -97,24 +97,24 @@ public class SmileOrganizationServiceImpl extends ServiceImpl<SmileOrganizationM
         //查询代理信息
         LambdaQueryWrapper<SmileOrganization> orgQueryWrapper = Wrappers.lambdaQuery(SmileOrganization.class);
         orgQueryWrapper.eq(SmileOrganization::getId, id);
-        orgQueryWrapper.eq(SmileOrganization::getDelTag,0);
+        orgQueryWrapper.eq(SmileOrganization::getDelTag, 0);
         SmileOrganization smileOrganization = smileOrganizationMapper.selectOne(orgQueryWrapper);
         if (smileOrganization != null) {
-            BeanUtils.copyProperties(smileOrganization,smileOrgAndUserVo);
+            BeanUtils.copyProperties(smileOrganization, smileOrgAndUserVo);
             LambdaQueryWrapper<SmileUser> userQueryWrapper = Wrappers.lambdaQuery(SmileUser.class);
-            userQueryWrapper.eq(SmileUser::getOrgId,id);
-            userQueryWrapper.eq(SmileUser::getDelTag,0);
+            userQueryWrapper.eq(SmileUser::getOrgId, id);
+            userQueryWrapper.eq(SmileUser::getDelTag, 0);
             List<SmileUser> smileUsers = smileUserMapper.selectList(userQueryWrapper);
             List<SmileUserVoOrg> smileUserVoOrgList = new ArrayList<>();
             smileUsers.forEach(smileUser -> {
                 SmileUserVoOrg smileUserVoOrg = new SmileUserVoOrg();
-                BeanUtils.copyProperties(smileUser,smileUserVoOrg);
+                BeanUtils.copyProperties(smileUser, smileUserVoOrg);
                 //关联组织id筛选
-                if (smileOrganization.getAgentId().equals(smileUser.getUid())){
-                   smileOrgAndUserVo.setSmileUserVoOrgListTotal(smileUserVoOrg);
-               }else {
-                   smileUserVoOrgList.add(smileUserVoOrg);
-               }
+                if (smileOrganization.getAgentId() != null && smileOrganization.getAgentId().equals(smileUser.getUid())) {
+                    smileOrgAndUserVo.setSmileUserVoOrgListTotal(smileUserVoOrg);
+                } else {
+                    smileUserVoOrgList.add(smileUserVoOrg);
+                }
             });
             smileOrgAndUserVo.setSmileUserVoOrgListOrdinary(smileUserVoOrgList);
             return smileOrgAndUserVo;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileSchoolServiceImpl.java

@@ -74,10 +74,7 @@ public class SmileSchoolServiceImpl extends ServiceImpl<SmileSchoolMapper, Smile
         if (smileSchoolMapper.selectOne(queryWrapper) == null) {
             int id = smileSchoolMapper.insert(smileSchool);
             smileRedisUtils.set(SmileRedisConst.SMILE_SCHOOL.concat(":").concat(String.valueOf(smileSchool.getId())),smileSchool.getName());
-            if (id > 0 && redisSchoolTag) {
-                //查询二十个学校放入redis中
-                updateSchoolRedis();
-            }
+            updateSchoolRedis();
             return AjaxResult.success();
         }
         return AjaxResult.warn("学校已存在");
@@ -108,7 +105,6 @@ public class SmileSchoolServiceImpl extends ServiceImpl<SmileSchoolMapper, Smile
 
 
     private void updateSchoolRedis() {
-        //查询20条学校数据
         List<SmileSchoolVo> smileSchoolVos = new ArrayList<>();
         smileSchoolMapper.selectListLimit().forEach(smileSchool -> {
             SmileSchoolVo smileSchoolVo = new SmileSchoolVo();

liquidnet-bus-do/liquidnet-service-smile-do/src/main/resources/com/liquidnet/service/smile/mapper/SmileSchoolMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.liquidnet.service.smile.mapper.SmileSchoolMapper">
 
     <select id="selectListLimit" resultType="com.liquidnet.service.smile.entity.SmileSchool">
-        select id,name from smile_school where  `del_tag` = 0 limit 20;
+        select id,name from smile_school where  `del_tag` = 0;
     </select>
 
     <select id="selectSchoolList" parameterType="java.util.Map" resultType="com.liquidnet.service.smile.entity.SmileSchool">