合并

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TaUserVerifyServicelmpl.java

@@ -97,14 +97,12 @@ public class TaUserVerifyServicelmpl implements TaUserVerifyServicel {
         taUserVerify.setCommunityName(toCommunities.getCommunityName());
         TaUser currentUser = taUserMapper.selectByPrimaryKey(taUserVerify.getUserId());
         taUserVerify.setLoginName(currentUser.getLoginName());
-        if ("2".equals(taUserVerify.getVerifyStatus()) || "1".equals(taUserVerify.getVerifyStatus())) {
 
-            // 开始查询 业主
-            TaUserVerify userVerify = taUserVerifyMapper.selectCommunityAndAddressAndRoleId(taUserVerify.getCommunityId(), taUserVerify.getPhaseId(), taUserVerify.getBuildingId(), taUserVerify.getUnitId(), taUserVerify.getLevelId(), taUserVerify.getRoomNoId());
-            if (null != userVerify) {
-                TaUser taUser = taUserMapper.selectByPrimaryKey(userVerify.getUserId());
-                taUserVerify.setOwnerName(taUser.getUserName());
-            }
+        // 开始查询 业主
+        TaUserVerify userVerify = taUserVerifyMapper.selectCommunityAndAddressAndRoleId(taUserVerify.getCommunityId(), taUserVerify.getPhaseId(), taUserVerify.getBuildingId(), taUserVerify.getUnitId(), taUserVerify.getLevelId(), taUserVerify.getRoomNoId());
+        if (null != userVerify) {
+            TaUser taUser = taUserMapper.selectByPrimaryKey(userVerify.getUserId());
+            taUserVerify.setOwnerName(taUser.getUserName());
         }
 
         responseBean.addSuccess(taUserVerify);

CODE/smart-community/operate-api/src/main/java/com/community/huiju/model/ToBanner.java

@@ -49,7 +49,6 @@ public class ToBanner {
     private String bannerContent;
     
     //@Min(value = 0,message = "请选择有效的投放社区!")
-    @NotNull(message = "投放社区不能为空！")
     private List<Integer> communityIds;
 
     public Integer getId() {

CODE/smart-community/operate-api/src/main/java/com/community/huiju/service/impl/ToBannerServiceImpl.java

@@ -107,6 +107,11 @@ public class ToBannerServiceImpl implements IToBannerService {
         banner.setUpdateDate(new Date());
         banner.setUpdateUser(toUser.getId());
 
+        if (banner.getCommunityIds().size() < 1){
+            response.addError("投放社区不能为空！");
+            return response;
+        }
+        
         try {
             for (Integer communityId : banner.getCommunityIds()){
                 banner.setCommunityId(communityId);
@@ -179,6 +184,11 @@ public class ToBannerServiceImpl implements IToBannerService {
             response.addError("失效时间不能小于或等于生效时间!");
             return response;
         }
+    
+        if (null == banner.getCommunityId()){
+            response.addError("投放社区不能为空！");
+            return response;
+        }
 
         ToUser toUser = toUserMapper.selectByPrimaryKey(currentUserId);