优化代码

java110-bean/src/main/java/com/java110/dto/communitySettingKey/CommunitySettingKeyDto.java

@@ -1,6 +1,7 @@
 package com.java110.dto.communitySettingKey;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -15,10 +16,11 @@ import java.util.Date;
 public class CommunitySettingKeyDto extends PageDto implements Serializable {
 
     private String keyId;
-private String remark;
-private String settingKey;
-private String settingType;
-private String settingName;
+    private String remark;
+    private String settingKey;
+    private String settingType;
+    private String settingName;
+    private String communityId;
 
 
     private Date createTime;
@@ -29,31 +31,40 @@ private String settingName;
     public String getKeyId() {
         return keyId;
     }
-public void setKeyId(String keyId) {
+
+    public void setKeyId(String keyId) {
         this.keyId = keyId;
     }
-public String getRemark() {
+
+    public String getRemark() {
         return remark;
     }
-public void setRemark(String remark) {
+
+    public void setRemark(String remark) {
         this.remark = remark;
     }
-public String getSettingKey() {
+
+    public String getSettingKey() {
         return settingKey;
     }
-public void setSettingKey(String settingKey) {
+
+    public void setSettingKey(String settingKey) {
         this.settingKey = settingKey;
     }
-public String getSettingType() {
+
+    public String getSettingType() {
         return settingType;
     }
-public void setSettingType(String settingType) {
+
+    public void setSettingType(String settingType) {
         this.settingType = settingType;
     }
-public String getSettingName() {
+
+    public String getSettingName() {
         return settingName;
     }
-public void setSettingName(String settingName) {
+
+    public void setSettingName(String settingName) {
         this.settingName = settingName;
     }
 
@@ -73,4 +84,12 @@ public void setSettingName(String settingName) {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(String communityId) {
+        this.communityId = communityId;
+    }
 }

java110-db/src/main/resources/mapper/community/CommunitySettingKeyV1ServiceDaoImplMapper.xml

@@ -20,7 +20,14 @@
         select t.key_id,t.key_id keyId,t.remark,t.status_cd,t.status_cd statusCd,t.setting_key,t.setting_key
         settingKey,t.setting_type,t.setting_type settingType,t.setting_name,t.setting_name settingName
         from community_setting_key t
+        <if test="communityId !=null and communityId != ''">
+            left join community_setting cs on t.setting_type = cs.setting_type and t.setting_key = cs.setting_key and
+            cs.status_cd = '0' and cs.community_id = #{communityId}
+        </if>
         where 1 =1
+        <if test="communityId !=null and communityId != ''">
+            and cs.setting_key is null
+        </if>
         <if test="keyId !=null and keyId != ''">
             and t.key_id= #{keyId}
         </if>

service-community/src/main/java/com/java110/community/cmd/communitySettingKey/ListCommunitySettingKeyCmd.java

@@ -57,7 +57,7 @@ public class ListCommunitySettingKeyCmd extends AbstractServiceCmdListener {
 
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
-        super.validatePageInfo(reqJson);
+        //super.validatePageInfo(reqJson);
     }
 
     @Override