Browse Source

优化楼栋名称

Your Name 3 years ago
parent
commit
69074977a7

+ 2 - 2
java110-core/src/main/java/com/java110/core/factory/SendSmsFactory.java

@@ -35,7 +35,7 @@ public class SendSmsFactory {
 
         if (!StringUtils.isEmpty(smsCompany) && SMS_COMPANY_ALI.equals(smsCompany.trim())) {
             AliSendMessageFactory.sendMessage(tel, code);
-        }else if(SMS_COMPANY_ALI.equals(smsCompany.trim())){
+        }else if(SMS_COMPANY_YIDONG.equals(smsCompany.trim())){
             YidongSendMessageFactory.sendMessage(tel,code);
         } else {
             TencentSendMessageFactory.sendMessage(tel, code);
@@ -47,7 +47,7 @@ public class SendSmsFactory {
         ResultVo resultVo = null;
         if (SMS_COMPANY_ALI.equals(smsConfigDto.getSmsType().trim())) {
             resultVo = AliSendMessageFactory.sendOweFeeSms(tel, param,smsConfigDto);
-        } else if(SMS_COMPANY_ALI.equals(smsConfigDto.getSmsType().trim())){
+        } else if(SMS_COMPANY_YIDONG.equals(smsConfigDto.getSmsType().trim())){
             resultVo = YidongSendMessageFactory.sendOweFeeSms(tel, param,smsConfigDto);
         } else {
             resultVo = TencentSendMessageFactory.sendOweFeeSms(tel, param,smsConfigDto);

+ 4 - 3
java110-db/src/main/resources/mapper/job/UserDownloadFileV1ServiceDaoImplMapper.xml

@@ -81,9 +81,7 @@
         <if test="remark !=null and remark != ''">
             , t.remark= #{remark}
         </if>
-        <if test="communityId !=null and communityId != ''">
-            , t.community_id= #{communityId}
-        </if>
+
         <if test="downloadUserName !=null and downloadUserName != ''">
             , t.download_user_name= #{downloadUserName}
         </if>
@@ -94,6 +92,9 @@
         <if test="downloadId !=null and downloadId != ''">
             and t.download_id= #{downloadId}
         </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
 
     </update>
 

+ 1 - 0
service-common/src/main/java/com/java110/common/smo/impl/AccessControlWhiteV1InnerServiceSMOImpl.java

@@ -150,6 +150,7 @@ public class AccessControlWhiteV1InnerServiceSMOImpl extends BaseServiceSMO impl
 
     @Override
     public int queryAccessControlWhitesCount(@RequestBody AccessControlWhiteDto accessControlWhiteDto) {
+
         return accessControlWhiteV1ServiceDaoImpl.queryAccessControlWhitesCount(BeanConvertUtil.beanCovertMap(accessControlWhiteDto));
     }
 

+ 6 - 0
service-community/src/main/java/com/java110/community/cmd/communityVenue/SaveCommunityVenueCmd.java

@@ -23,6 +23,7 @@ import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.intf.community.ICommunityVenueV1InnerServiceSMO;
+import com.java110.intf.user.IUserV1InnerServiceSMO;
 import com.java110.po.communityVenue.CommunityVenuePo;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
@@ -52,6 +53,9 @@ public class SaveCommunityVenueCmd extends Cmd {
     @Autowired
     private ICommunityVenueV1InnerServiceSMO communityVenueV1InnerServiceSMOImpl;
 
+    @Autowired
+    private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "name", "请求报文中未包含name");
@@ -67,6 +71,8 @@ public class SaveCommunityVenueCmd extends Cmd {
         communityVenuePo.setVenueId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
         int flag = communityVenueV1InnerServiceSMOImpl.saveCommunityVenue(communityVenuePo);
 
+
+
         if (flag < 1) {
             throw new CmdException("保存数据失败");
         }