springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActEvaluateMapper.xml
@@ -38,13 +38,12 @@ WHEN su.is_partymember = 1 THEN '党员' WHEN caas.is_volunteer = 1 THEN WHEN caae.is_volunteer = 1 THEN '志愿者' ELSE '居民' END identity FROM com_act_act_evaluate caae LEFT JOIN com_act_act_sign caas ON caae.activity_id = caas.activity_id AND caae.user_id = caas.user_id LEFT JOIN sys_user su ON caae.user_id = su.user_id where caae.activity_id = #{comActActEvaluateVO.activityId} <if test="comActActEvaluateVO.phone != null and comActActEvaluateVO.phone !=''"> @@ -53,7 +52,7 @@ <if test="comActActEvaluateVO.name != null and comActActEvaluateVO.name !=''"> AND su.`name` = #{comActActEvaluateVO.name} </if> <if test="comActActEvaluateVO.starLevel != null"> <if test="comActActEvaluateVO.starLevel != null and comActActEvaluateVO.starLevel != 0"> AND caae.star_level = #{comActActEvaluateVO.starLevel} </if> <if test="comActActEvaluateVO.createAt != null"> @@ -73,13 +72,12 @@ WHEN su.is_partymember = 1 THEN '党员' WHEN caas.is_volunteer = 1 THEN WHEN caae.is_volunteer = 1 THEN '志愿者' ELSE '居民' END identity FROM com_act_act_evaluate caae LEFT JOIN com_act_act_sign caas ON caae.activity_id = caas.activity_id LEFT JOIN sys_user su ON caae.user_id = su.user_id where caae.activity_id = #{comActActEvaluateVO.activityId} <if test="comActActEvaluateVO.phone != null and comActActEvaluateVO.phone !=''"> @@ -88,7 +86,7 @@ <if test="comActActEvaluateVO.name != null and comActActEvaluateVO.name !=''"> AND su.`name` = #{comActActEvaluateVO.name} </if> <if test="comActActEvaluateVO.starLevel != null"> <if test="comActActEvaluateVO.starLevel != null and comActActEvaluateVO.starLevel != 0"> AND caae.star_level = #{comActActEvaluateVO.starLevel} </if> <if test="comActActEvaluateVO.createAt != null"> springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActRegistMapper.xml
@@ -32,13 +32,12 @@ WHEN su.is_partymember = 1 THEN '党员' WHEN caas.is_volunteer = 1 THEN WHEN caar.is_volunteer = 1 THEN '志愿者' ELSE '居民' END identity FROM com_act_act_regist caar LEFT JOIN com_act_act_sign caas ON caar.activity_id = caas.activity_id LEFT JOIN sys_user su ON caar.user_id = su.user_id where caar.activity_id = #{comActActRegistVO.activityId} <if test="comActActRegistVO.phone != null and comActActRegistVO.phone !=''"> @@ -66,13 +65,12 @@ WHEN su.is_partymember = 1 THEN '党员' WHEN caas.is_volunteer = 1 THEN WHEN caar.is_volunteer = 1 THEN '志愿者' ELSE '居民' END identity FROM com_act_act_regist caar LEFT JOIN com_act_act_sign caas ON caar.activity_id = caas.activity_id LEFT JOIN sys_user su ON caar.user_id = su.user_id where caar.activity_id = #{comActActRegistVO.activityId} <if test="comActActRegistVO.phone != null and comActActRegistVO.phone !=''"> springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -1839,8 +1839,13 @@ List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO .selectList(null); if (!ObjectUtils.isEmpty(comMngUserTagDOS)) { list = comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName()) .collect(Collectors.toList()); for (ComMngUserTagDO comMngUserTagDO : comMngUserTagDOS) { if (!list.contains(comMngUserTagDO.getTagName())) { list.add(comMngUserTagDO.getTagName()); } } // list = comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName()) // .collect(Collectors.toList()); } return R.ok(list); }
