Merge branch 'CH-1127-修改机构通信地址限制25个字符' of sckj/mz-cloud into master

ruoyi-modules/mz-organization-jg/src/main/java/com/ruoyi/organization/domain/YljgJgjs.java

@@ -46,12 +46,12 @@ public class YljgJgjs extends BaseEntity
     @ApiModelProperty(value = "咨询联系人")
     @Size(max = 50, message = "{咨询联系人}")
     @ChineseV(message = "{咨询联系人}")
-    @EncryptionV
+//    @EncryptionV
     private String zxlxr;
 
     @ApiModelProperty(value = "咨询联系电话")
     @Size(max = 20, message = "{咨询联系电话}")
-    @EncryptionV
+//    @EncryptionV
     private String zxlxdh;
 
     @ApiModelProperty(value = "服务内容")

ruoyi-modules/mz-organization-jg/src/main/java/com/ruoyi/organization/service/impl/YljgJgjsServiceImpl.java

@@ -54,7 +54,6 @@ public class YljgJgjsServiceImpl implements IYljgJgjsService
         List<YljgJgjs> list = yljgJgjsMapper.selectListMM();
         List<YljgJgjs> ll = new ArrayList<>();
         list.forEach(item->{
-            System.out.println("AAAAA:  " + item.getId());
             YljgJgjs y = new YljgJgjs();
             y.setId(item.getId());
             y.setZxlxr(item.getZxlxr());

ruoyi-ui/Dockerfile

@@ -13,7 +13,7 @@ RUN npm install
 
 ADD . /code
 
-RUN npm run build:dev
+RUN npm run build:prod
 
 #环境变量写在build后面否则找不到指令
 ENV PROJECT_ENV production

ruoyi-ui/src/views/organization/jggl/jcxx/index.vue

@@ -1623,7 +1623,8 @@ export default {
         this.loading = true
         getJgjs(id).then(response1 => {
             if(response1.data!=null) {
-              this.form2 = decryptData_ECB(response1.data, ["zxlxr", "zxlxdh"], [1, 2]);
+              // this.form2 = decryptData_ECB(response1.data, ["zxlxr", "zxlxdh"], [1, 2]);
+              this.form2 = response1.data;
 
               this.form2.zt="1";
             }else{

ruoyi-ui/src/views/organization/jggl/sqJcxx/index.vue

@@ -1983,7 +1983,8 @@ export default {
         this.loading = true
         getJgjs(id).then(response1 => {
           if(response1.data!=null) {
-            this.form2 =  decryptData_ECB(response1.data, ["zxlxr", "zxlxdh"], [1, 2]);
+            // this.form2 =  decryptData_ECB(response1.data, ["zxlxr", "zxlxdh"], [1, 2]);
+            this.form2 =  response1.data;
             this.form2.zt="1";
           }else{
             this.form2.zt="0";