From 17b309f8cb2981a63fefded5c5eb89d82c063923 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 11 May 2023 16:30:24 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E6=A5=BC=E5=BC=A0=E5=8D=95=E5=85=83?=
 =?UTF-8?q?=E9=95=BF=E5=AF=BC=E5=85=A5=E6=A8=A1=E6=9D=BF=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ommunity_building_manager_import_temp.xlsx | Bin 9463 -> 10742 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/yantai/community_building_manager_import_temp.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/yantai/community_building_manager_import_temp.xlsx
index 46c532d2b5df5eb27f9fd0230f5822602f697803..e8ceae9aa1ff6720df536d9991372ae86a1c18c6 100644
GIT binary patch
delta 7654
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

delta 6331
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


From 81c12e037d53d14ad75e489073e1aafe5207b3cf Mon Sep 17 00:00:00 2001
From: lichao <326994889@qq.com>
Date: Thu, 11 May 2023 16:43:26 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/controller/StaffController.java |  2 +-
 .../excel/CustomerStaffImportExcelData.java   |  7 +++++
 .../handler/CustomerStaffImportListener.java  | 28 +++++++++++++++++--
 .../epmet/service/impl/StaffServiceImpl.java  |  4 +--
 4 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java
index 23807cd908..1495e595a0 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java
@@ -259,7 +259,7 @@ public class StaffController implements ResultDataResolver {
 
 		Path fileSavePath;
 		try {
-			Path importPath = FileUtils.getAndCreateDirUnderEpmetFilesDir("ic_nat", "import");
+			Path importPath = FileUtils.getAndCreateDirUnderEpmetFilesDir("staff", "import");
 			fileSavePath = importPath.resolve(UUID.randomUUID().toString().concat(extName));
 		} catch (IOException e) {
 			String errorMsg = ExceptionUtils.getErrorStackTrace(e);
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffImportExcelData.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffImportExcelData.java
index d724dc35b4..c667472284 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffImportExcelData.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffImportExcelData.java
@@ -60,6 +60,13 @@ public class CustomerStaffImportExcelData {
     @Data
     public static class RowRemarkMessage {
 
+        @ColumnWidth(60)
+        @ExcelProperty("姓名")
+        private String name;
+
+        @ColumnWidth(60)
+        @ExcelProperty("联系电话")
+        private String mobile;
 
         @ColumnWidth(60)
         @ExcelProperty("错误信息")
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/CustomerStaffImportListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/CustomerStaffImportListener.java
index 28d91229af..7a8406eb8f 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/CustomerStaffImportListener.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/CustomerStaffImportListener.java
@@ -38,6 +38,8 @@ public class CustomerStaffImportListener implements ReadListener<CustomerStaffIm
 
     private String currentOrgId;
 
+    private CustomerStaffImportExcelData dataB;
+
 
     /**
      * 数据
@@ -67,6 +69,8 @@ public class CustomerStaffImportListener implements ReadListener<CustomerStaffIm
     public void invoke(CustomerStaffImportExcelData data, AnalysisContext context) {
 
         try {
+
+            dataB = data;
             // 先校验数据
             ValidatorUtils.validateEntity(data);
 
@@ -144,6 +148,8 @@ public class CustomerStaffImportListener implements ReadListener<CustomerStaffIm
 
             CustomerStaffImportExcelData.RowRemarkMessage errorRow = new CustomerStaffImportExcelData.RowRemarkMessage();
             errorRow.setErrorInfo(errorMsg);
+            errorRow.setName(data.getName());
+            errorRow.setMobile(data.getMobile());
             errorRows.add(errorRow);
         }
     }
@@ -151,7 +157,25 @@ public class CustomerStaffImportListener implements ReadListener<CustomerStaffIm
     @Override
     public void doAfterAllAnalysed(AnalysisContext context) {
         // 最后几条达不到阈值，这里必须再调用一次
-        execPersist();
+        try {
+            execPersist();
+        }catch (Exception e) {
+            String errorMsg = null;
+            if (e instanceof ValidateException) {
+                errorMsg = ((ValidateException) e).getMsg();
+            } else {
+                log.error("【客户信息导入】出错:{}", e.getStackTrace());
+                errorMsg = ((EpmetException)e).getInternalMsg();
+                log.error("【客户信息导入】出错:{}", ExceptionUtils.getErrorStackTrace(e));
+            }
+
+            CustomerStaffImportExcelData.RowRemarkMessage errorRow = new CustomerStaffImportExcelData.RowRemarkMessage();
+            errorRow.setErrorInfo(errorMsg);
+            errorRow.setName(dataB.getName());
+            errorRow.setMobile(dataB.getMobile());
+            errorRows.add(errorRow);
+        }
+
     }
 
     /**
@@ -163,7 +187,7 @@ public class CustomerStaffImportListener implements ReadListener<CustomerStaffIm
 //                icNatService.batchPersist(datas, this);
                 staffService.exportAdd(datas,this);
             }
-        } finally {
+        }finally {
             datas.clear();
         }
     }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java
index c45dc5d646..8c74a45df3 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java
@@ -792,9 +792,9 @@ public class StaffServiceImpl implements StaffService {
 			if (errorRows.size() > 0) {
 				try {
 					// 文件生成
-					Path errorDescDir = FileUtils.getAndCreateDirUnderEpmetFilesDir("ic_nat", "import", "error_des");
+					Path errorDescDir = FileUtils.getAndCreateDirUnderEpmetFilesDir("staff", "import", "error_des");
 					String timeMillis = String.valueOf(System.currentTimeMillis());
-					String fileName = "icnat_import_error_".concat(timeMillis).concat(".xlsx");
+					String fileName = "staff_import_error_".concat(timeMillis).concat(".xlsx");
 
 					fileItem = new DiskFileItemFactory(DiskFileItemFactory.DEFAULT_SIZE_THRESHOLD, errorDescDir.toFile())
 							.createItem("file", ContentType.APPLICATION_OCTET_STREAM.toString(), false, fileName);

From a9af7fa940f4607f8a03258b27a7e476562b8efc Mon Sep 17 00:00:00 2001
From: lichao <326994889@qq.com>
Date: Thu, 11 May 2023 16:53:29 +0800
Subject: [PATCH 3/8] =?UTF-8?q?excel=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../excel/customer_staff_import_template.xlsx | Bin 9594 -> 9646 bytes
 .../main/resources/excel/house_template.xlsx  | Bin 9801 -> 9864 bytes
 .../resources/excel/neighbor_template.xlsx    | Bin 11577 -> 11817 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/customer_staff_import_template.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/customer_staff_import_template.xlsx
index 75678505187e1fc06269d98c4168f447e4c92451..4b9b2f1fce4c258bfe08fc043128233f56b86a07 100644
GIT binary patch
delta 4520
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
G0002V^Lmp2

delta 4487
zcmV;25qR#dOZrN%lmP{J6Y-5~lbHc3f0N1dM+ws@sB~pPu%fsN$!$A0lNplev=1Tp
z0)nC&L0!3UA^0*@`xs`XKei}BHpw~n<D5&v_9#u93s5@FWD60`M-E7yiC7L==&09m
zw~?a_lY%9ggccfuM(t>GBjh>dnSukA<)BOq+OZ_5DbHJIXiQEq)_e#l)1Gxme=GJg
zl`><mYJhXb&)5KP;QLLSf?<LghD)HEFNtW56nu%y&s9<Z1jmp-3espyJc56`22`s5
z9H^8PXBwMvZadB6uCfK6iA(oL$4g^T6kbuQV%YoypLF*RtEz4+%Uy9mQ7Aa&3Yf`M
zG<~_BJYU-r;+5BOg9+27YnR=RU_tDRqmS3iuZQ=~o43i+)%5mpdV3e*-!6-;n#}kh
z9Gi{Knk<y#+U{PjgQCDEO_v0&-{_GhZPcmnpOzuk=F6<Jhjbq0Ut&<RIG2zfsnPlt
z4T2To0uWWX*Z)WK4YMEvv;hi@v|Q6^1ONb(43pjjAb(qr+e8?BN8&$Ne&8v!J<e@6
zB&pin?xm$t#X|c$>r9f-jy>*pvfky52h<9ID#S&Iix7fRiBbu{1AXA<G+p=?obe@z
z<!zNNLR6~9o;f++`7ZO#Z2$5}D6C_q5-y{GO&rg*SQN++k0t~A-FJ2_ZP-?#X*8lj
zMr>f8vVX+BJbeANek#>bGG$C#V2F}|J=Hqyxo#3nSx6H{#w^0hSgMd}e5#3?#EQ{T
z_M=d^zUOt^kn+gR8G33R4mlq4fNjfQ7P3g^B#H^Dp+A}OI4RjqMr-kn6iwl4sb@vv
zcD}OUBdwagkOxX8a;%*|hHfsc?&YStS@AOrYJWuM1S_QKXck`raSZ1Ux#0RVbGH=4
z^pYn{QzwlRCx{9aD*+;1m+7rpqGh;EHMNKRECaWcJM51*qG(cYDK;M1S4i(h$Hshy
zxXoFbth`&A9v(2k0?kG!727f;a46-G0q$eUGu#=#Fw#KtW46VF7}(dzCd%k;X2iV1
zgnzrRvHD)x+sVr2ma;}{OlLxGNpXjd^mJhRp3`ah8|^O1pLPj(Tc&%APo^5$x=zQo
z<V*`5vA5VU6IdMBZDTi(0!Hw(LT)PFwnBQ6yOSFrp40M3cVWTQ|EWOfw`?oO!dNIF
z1zk?$7epA-f`~Y+cDuQvbS<K0L4>g+@_(EqOUpN*Tt^Y~X0Bl@iTn!@wF@GQB~iyA
zo69sH*lQ^QE>ncDB)V9zy9E)(lBji|tf9MQiZCvTn%+vd*K`d@$%rtPL~REFTPrRE
zT{rtR=`_2`DA!AUJvNY(kp|($GXF0jG&?fi8ri-yonqKmGPTe}u}9F~@yyFV-+!Cg
zgxPHVVqvlUfRCv;6G)E`G=;#hT*+zR9)6Ty_IT*^-D6|7KwPaONENYFNBC95b{)~I
zBCgdDttw)tj%ZgAyLCjTirA|ox>dw}9kEeGT(2WGtB4zQ1X%{vMgA5^L|;Ne@H{t(
zq-{E8zEn?Rx7RJRxSR7dvlhO}kAHRremq}+A4OM`7-}?Y+~>+z!caWxz~IVDVfopU
z*Z2sPewzx8(Oe;{K+Yl*XbTQkmn?l6;}j4)(Y8f}km*%HqoaI#Ol7(s#WQ`AB?+AX
zW)g$RYf4E~namHteZRL)ycQ0b4h)$~(o9e?eB<s+>NlS~{q(Q*KWfZB_<s{aKGk;@
zn7&)p^`Gk8^{w4zZ}){#=f6IfKly3?;KS!%+&laFx5oVbx6htFY2ZJcX#D;7OY=4V
z@sas@{>?9Ek3MOfegFCVhsTZi$6sOif4$rDdwVZ*?d-EZ8uN$0L-x;S-#vVFq5rl-
z&|^$ft|l8-ml*YRld1_vv2F@BMy+~|IW$y$_sKuBjI$a%lp6QG>~)H}H$xxxoHl$W
zo$?>f(6N;I{3R$b_70ey#a2vXrVjXfC~q8dQgPhCvt2W=W2v;FTpP)`p`DBq8--7z
zJ6ul-$>x@5B>@%8OyZhqCXAnpzbA(OlVBYiv$6>%27koA0aB_8001CU000dD004Mw
zFLQKxY-MvUcx`OeTy1aL))oFfVE=(ouzd(-OQfi`)N&Tf7EquY3M2ytY(pSRludvl
zJ(3FS4h6EMnYRuZFr-_yqQJTqUiM+}wr*I1u1Wt)q}ZSO7k2IoFVB@OB{~r$Is#&f
z(s_T*xqs)rP#f0|2aa~f@&ns*n+1KnRM0H9>-B7RuUYuPt@c{Ipao&a?R6Z_wVH(^
zD=1vw{N^_{g7C<(Zth!Fr~wN%XcqRv@Zegp7<BioK_^)E4lEZw>3ja56T(}6uNWNo
zR;L#bqJdL1N~LOX(6QaZ=7u{Qv<G3Jb-ke*Hh&AIxTUdA-t56mqo6TvEw2Zv+}6JR
z)1eo>@%2|H?Bc3+<vUldlx}NpC_eh}+Kdkw{Tlm2>A!nhD-<KWuoC4-CAie}5)*t?
z<C5YV68G!ZXY)5F`7`QCBO~rppH4`h`usx5=#$D|7Yj?NL05S+6izJi=x%QGJvR=r
zQGbRglRKLm!8_WWjsy5JsM9+Gi@hJ6{^rHAhvZ&&zvBmhHTJc#N$wRH@dS&~f>?At
z$MZFRZ?{=!!@m;zdwtG2wMF85qqd!rGnG%%i@RrFyPluy2_!6poP?C2ciegIeSJCU
zJe5+84WSkQK{oNw)Y{~gDl{nt?j{K2PJb+?lBF|@ULaf)`wVp#3fILYO*`=d_<j{9
z)``m`)3S2nv}uhNWNtN8%wEN`O4g?BVl+~>W$8#s+O#uCC2TJ<*{BLxRxDmc8m($2
z`!dXh0Uq_m3L9dOOoxpOUdstvG+r)zRGVXA9W1QV{9P1S=43*-O<pAV7bS4U7=K4Z
z)fQC4Xx9`#=Vd#NXt-gpVs|z-4mx3I`EDCN*7)_UqXTFjT$lh5dy9l}?zi{+&XI1=
z>X?oo@Ep5GwAgFW{)mr(&<}?;nG=-OY16mMKepYTb!fq~pvrndq;^^r=S!?K;9t4k
zs2YvBUZTciFTWC7Tn6#AN~K=W8-IqWH;DJMm%k)2)fJmb(<ysz!u&bH@2b&M12on3
zYQ0`>m}PxQ*+g5v?A?r#W+iS$XkM=TXuxf^YOS4&3j~*Sqe5O8%i`s~wyN|Ie%;w>
zv@*7p%W743+L^~t4692SOHf)YxB5ikGurUVIDFGkUCFqOMw;dNT0lySbbqUszY_m1
zsUo5<uf$ALkyjGt#;QgH4s#@bx%NjT4HjTpS&vB5wk{WI!q!%+v84G(?V_Uuoz}uc
zde`%Nuz{xWy(`$mi0*A}I95M|f!4S8_Q~JSJ0QcZ7lz&dE_!xn&vQEtToxG@nG$y1
zV3Vy`2>0nG8C&=33`38v<bM|ld(M6Ccc~6kg}Gk^H7}Qzb1h;nUzx{6&=;mCa8!XR
z;@|UzyN(4wWS9}@1j}S}br9f2FgV{KbL0%Ho;@50In$khN#>kp%`DZ-iczJVSk|&x
zHl;Ifw!h*vK2@fveT-<PGj1*k%DmL7y;>+E_EK#T@gqK*uZ#5cw0~+S1#^JLdwD8{
zOR7#&OuKsyfx^H!6pOGC0c2kJ<~AaVbT%S_lr|!YMcBAykQW(H)5Z}|q_Ytbq_h!H
z%(9V>#4xaTEyuY@M&KXz#prG}px7Pu(TNZ^F+)xukP|B864u7~B^%M%o6U`mWAC{G
z%Y`EhmLJ+(a@?T{Z+|VHy6Lc=%of(RBDQ5Xk%9SYor44C==;OLuI0DsNgJvKy}L#G
zlKB0NNQ3y++rAfC-H@LBDS=_Hp(HuC!fiKTijYqwu_xgmPd=42$T=tO$}(KXTEf(0
zM!c66U+8d=QULlHO05ipuv?NRB~5y+i<JqO!AJ20=f&ZTJb&4SauVlg8=w%sTdqG*
zzT_*XA-GY|y_DVrG)%`m4`m!h+<?W~{3{6x=U>T75$@c!7NnF%1=El!<|+q7lqovY
zpnQT*ha8SvN3Qd!CGH(_+gs=`0t#2=YczzMh(<%~%G`FiI?5d>pCONC^pbKXlx@4K
zlcVpv3D@)MNPiS=IM9L88vr`PliB*tK)#dfwH~#&>Q*OPwaBz33aNxTsEadvwM^8Z
zYAtCv+ikLjTdSJ(=WD_RE{kd+D%^SYDto@^vP}_j1<F@1Zqi4!E}K6|!BkeM{MG<c
z)i0UK7`3^b_n>J{p6eEgK3@PweO+!R8)&_#EV-4me1Eh00BKb&+g1g^)5z_xih@ll
zK>nwe`JJUBOkTi~OYi$k(%AD<pQmzLN|&Xpii#4MzA1;N{Pg`O-*XGnq%IoDz^tk%
z?OtSCHBmu=%iPza+^#Al<qM#6$&oJNEqJyekM`oLue24f9rhQnCy$mmq>2sqBmT@;
ztPV!4MSnCokKUt%(53zNeb2Ywff9<230(Z(K$4QM5RxAyNu}lsZIUMeg|d>d?_TSm
zLXx~Grz}VwT6KcUxGK#-3L7yaoW!~?R4oQKG`%39&`}rppo>U9jXdPqER3E$J$w8f
z3e4`%cHr?gmQZlqXOf^=`j)n)jlTTi?4S3>e}6b0J$ZEg$wz0u{!D|hmqiyWL`*95
z(9k3oBZ&)CB*uk!HdX~zQWUx<v=H>979)E01a)-$hZ}$P{Nd>SNhA?S5e3ZJ6%x%P
zy#=<(I2Fq+)1%I*truL#TnlkwzqT-`{eK>hp8h=2p6p-56!cNRNwErd34x?ZiOI|K
z=zsJi{mVZ+AN}f=<9~b*$s`k*n20_tF-emM7m=KFrV(=~)2BF7vjKN=)XA_jl`d0w
zAl5@hT$%ka!-UTh%>n6L4;grH+(!YUL^cAxbnQR(3LG|3usJ*Z%gfV8Lb41!ICP{S
zQFtI$T}B<uQxy!(@BZS&(<efv3_C;V^?$@<kAo+}&s1Vybn;Aym5~SM8Wfr)iWLUa
zt&G^ouy~+gGyd1{`0oEA$z&%4VV*q>KZ(}S=cnTPGOFMpol3-~cgKG|89n&@=>EO&
z$6pFs8A|Z$N(x$1!;ZfYBojqUS@y;sAD@5nM=f@P3>?^1R>^t%>G|>d<GYWc=zott
z`nwP)W2U0iF)<P%`RD;d6bU8Vx!xj20BtxH>}mSRSe(%+`J>WLgvK&<lmSUB^FlUV
zXo?kvm1%{~Mi1`2c=iBl=J|&oMB?dr&zMk6_xWdMr(c~vI(_-!duRW>fBx|K__rs5
zfs80+k}^*T3K>VRSF6x9(PR-L_<uzS?C!FX&DoQ`j(+#Pj1l-ICWKWvh5W>lD26B)
z8891Dovr`=8^BapE|(`5Y7~+a(FyWcO)twpt0>thDyyh(&<04VD_xfu0ig$&jM-F_
zj+_DvS>r(^OIe~ZQc<pu4J<^eEDSs=1x&~$4WfZV77Cvy+A3T|j#nZ!rhk$Rmn|S-
zP9RNf>x|wNMjlD3GP@F$7Znw>#cUww6+U2TJyrFgbHTI*Ers#48Cv_W15X0cW9*{0
z2VnH9erM=}x5S6dLVW!_`cx0Zh=1#C`;He<7R^F@{T6wsjg^1vFnlY3C(+=qHuUXg
z;b%KrwZ`^N+gPiYw(4tU*<h-yH7Z-%YZbG#wY}YLl#EjAUC0>n(~;K>b#v<HBL{ZZ
z_X4jUu6N;CIj`ThyVmp%NH&U%=qDtB$+f_NZ~5F<uKdmTUbBGSF!hP6i=a09pBhmN
z#7|pp{vS|F0|b-mBO0^78v6zT#gn`tKmje2{UI{}QIjzulLdGa@r`Vg$s$w%A(I{>
zKmmG_Un4L9d6SSMHUgj?lkgrKljI{R0dA8IBqtlhzX4LJ3IG5gQvd)B0000000001
z03ZMW0GX3fBsu|RlZ+%b0gaQxBtQbq8<PbkI{}-MK_wv@jkH|TX#@ZOlnej>7ytkO
Z000000RSKX00766eI+XfT_FGf007X1f&c&j

diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/house_template.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/house_template.xlsx
index b325adef252fcb610cbddc046297653fd12c9052..5aca0af7a6fc4863b5895aea6d75ab11722d4d7b 100644
GIT binary patch
delta 4958
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

delta 4872
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

diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/neighbor_template.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/neighbor_template.xlsx
index 31c08448700469717ae43da077772129b6e087b0..d98c075d9cc2bd770616a0d787958d8c5f098f22 100644
GIT binary patch
delta 5363
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

delta 5127
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
TAn-p5n!iy1`imiW{>lCeF~FTv


From f2786fcdb780e8f205ade4535f88f84cc7c50408 Mon Sep 17 00:00:00 2001
From: lichao <326994889@qq.com>
Date: Fri, 12 May 2023 11:09:03 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=B0=8F=E5=8C=BA?=
 =?UTF-8?q?=E7=89=A9=E4=B8=9A=E5=85=B3=E8=81=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/ImportGeneralDTO.java  |   5 +++++
 .../entity/IcPropertyManagementEntity.java    |   3 +++
 .../com/epmet/excel/IcNeighborHoodExcel.java  |   6 ++++++
 .../model/ImportNeighborHoodInfoListener.java |   7 +++++++
 .../epmet/model/NeighborHoodInfoModel.java    |   6 ++++++
 .../main/resources/excel/neighbor_export.xlsx | Bin 11704 -> 11817 bytes
 .../resources/excel/neighbor_template.xlsx    | Bin 11817 -> 11856 bytes
 .../resources/mapper/IcNeighborHoodDao.xml    |   2 ++
 8 files changed, 29 insertions(+)

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java
index 1c25e75f50..d617ad39dd 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java
@@ -223,4 +223,9 @@ public class ImportGeneralDTO implements Serializable {
 
     private String buildingLeaderTypeNum;
 
+
+    private String propertyUserName;
+
+    private String propertyUserMobile;
+
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPropertyManagementEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPropertyManagementEntity.java
index c0ea9df16d..81a75f86ec 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPropertyManagementEntity.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPropertyManagementEntity.java
@@ -17,6 +17,8 @@
 
 package com.epmet.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
@@ -39,6 +41,7 @@ public class IcPropertyManagementEntity extends BaseEpmetEntity {
      * 物业名称
      */
 	private String name;
+	@TableField(fill = FieldFill.INSERT)
 	private String customerId;
 	/**
 	 * 烟台需求：物业联系人姓名
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcNeighborHoodExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcNeighborHoodExcel.java
index 227ed90e4a..0406b33490 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcNeighborHoodExcel.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcNeighborHoodExcel.java
@@ -124,6 +124,12 @@ public class IcNeighborHoodExcel extends ExcelVerifyInfo implements Serializable
     @Excel(name = "关联物业")
     private String propertyName;
 
+    @Excel(name = "物业联系人")
+    private String propertyUserName;
+
+    @Excel(name = "联系电话")
+    private String propertyUserMobile;
+
     @Excel(name = "详细地址")
     @NotBlank(message = "不能为空")
     private String address;
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportNeighborHoodInfoListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportNeighborHoodInfoListener.java
index 5bacafb1fe..f4fe33adb2 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportNeighborHoodInfoListener.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportNeighborHoodInfoListener.java
@@ -185,6 +185,13 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener<Neighb
                         disposePropertyNames.forEach(name -> {
                             IcPropertyManagementEntity e = new IcPropertyManagementEntity();
                             e.setName(name);
+                            for (ImportGeneralDTO importGeneralDTO : notExistList) {
+                                if (importGeneralDTO.getPropertyName().equals(name)){
+                                    e.setContactMobile(importGeneralDTO.getPropertyUserMobile());
+                                    e.setContactName(importGeneralDTO.getPropertyUserName());
+                                    break;
+                                }
+                            }
                             propertyManagementEntities.add(e);
                         });
                     }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/NeighborHoodInfoModel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/NeighborHoodInfoModel.java
index b1f33f409b..374f367a2e 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/NeighborHoodInfoModel.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/NeighborHoodInfoModel.java
@@ -36,6 +36,12 @@ public class NeighborHoodInfoModel {
     @ExcelProperty(value = "关联物业")
     private String propertyName;
 
+    @ExcelProperty(value = "物业联系人")
+    private String propertyUserName;
+
+    @ExcelProperty(value = "联系电话")
+    private String propertyUserMobile;
+
     @ExcelProperty(value = "详细地址")
     private String address;
 
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/neighbor_export.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/neighbor_export.xlsx
index 2d89d9255729ab7c6c41c736ad33386460df8c27..91a9637774b3ec0d1524f1b61864c5f699114f2a 100644
GIT binary patch
delta 5473
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
Qz;a{=FAt6z=idSU0?&yr%K!iX

delta 5340
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

diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/neighbor_template.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/neighbor_template.xlsx
index d98c075d9cc2bd770616a0d787958d8c5f098f22..ca0705dea6edd4cbdf5aef5638a9956aa7d9c993 100644
GIT binary patch
delta 5758
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

delta 5700
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

diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml
index 7f51133503..574d29a6ae 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml
@@ -197,6 +197,8 @@
         a.ADDRESS as address,
         a.REMARK as remark,
         e.NAME as propertyName,
+        e.CONTACT_NAME as propertyUserName,
+        e.CONTACT_MOBILE as propertyUserMobile,
         b.ORGANIZATION_NAME as agencyName,
         c.GRID_NAME as gridName
         from ic_neighbor_hood a

From 770d2d6e524c172a2e8345ad28190436c9f01f36 Mon Sep 17 00:00:00 2001
From: lichao <326994889@qq.com>
Date: Fri, 12 May 2023 15:38:03 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E6=A5=BC=E6=B4=9E=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/BuildingServiceImpl.java     | 112 +++++++++++++++++-
 1 file changed, 108 insertions(+), 4 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java
index 5f16fb2c62..8eb14781f5 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java
@@ -92,6 +92,8 @@ public class BuildingServiceImpl implements BuildingService {
     private IcOrganizationCodeInfoDao icOrganizationCodeInfoDao;
     @Autowired
     private IcOrganizationCodeInfoServiceImpl icOrganizationCodeInfoServiceImpl;
+    @Autowired
+    private CommunityBuildingManagerDao communityBuildingManagerDao;
 
 
     @Override
@@ -103,8 +105,8 @@ public class BuildingServiceImpl implements BuildingService {
         if (null != count && count > 0) {
             throw new RenException(EpmetErrorCode.BUILDING_NAME_EXITED.getCode(), EpmetErrorCode.BUILDING_NAME_EXITED.getMsg());
         }
-        IcNeighborHoodEntity neighborHood = icNeighborHoodDao.selectById(formDTO.getNeighborHoodId());
-        count = icBuildingDao.checkBuildNameV2(formDTO.getAgencyId(), neighborHood.getNeighborHoodName(), formDTO.getBuildingName(), null);
+        IcNeighborHoodEntity neighborHood1 = icNeighborHoodDao.selectById(formDTO.getNeighborHoodId());
+        count = icBuildingDao.checkBuildNameV2(formDTO.getAgencyId(), neighborHood1.getNeighborHoodName(), formDTO.getBuildingName(), null);
         if (null != count && count > 0) {
             throw new EpmetException(EpmetErrorCode.BUILDING_NAME_EXITED_IN_GRID.getCode());
         }
@@ -121,6 +123,57 @@ public class BuildingServiceImpl implements BuildingService {
         IcBuildingEntity entity = ConvertUtils.sourceToTarget(icBuildingDTO, IcBuildingEntity.class);
         icBuildingDao.insert(entity);
 
+
+        LambdaQueryWrapper<CommunityBuildingManagerEntity> manager = new LambdaQueryWrapper<CommunityBuildingManagerEntity>().eq(CommunityBuildingManagerEntity::getBuildingId,entity.getId());
+        CommunityBuildingManagerEntity communityBuildingManagerEntity = communityBuildingManagerDao.selectOne(manager);
+
+
+        if (StringUtils.isNotBlank(entity.getBuildingLeaderType())&&
+                StringUtils.isNotBlank(entity.getBuildingLeaderIdCard())&&
+                StringUtils.isNotBlank(entity.getBuildingLeaderMobile())&&
+                StringUtils.isNotBlank(entity.getBuildingLeaderName())){
+
+            if (communityBuildingManagerEntity!=null){
+                communityBuildingManagerEntity.setIdCard(entity.getBuildingLeaderIdCard());
+                communityBuildingManagerEntity.setPhone(entity.getBuildingLeaderMobile());
+                communityBuildingManagerEntity.setType(entity.getBuildingLeaderType());
+                communityBuildingManagerEntity.setName(entity.getBuildingLeaderName());
+                communityBuildingManagerDao.updateById(communityBuildingManagerEntity);
+            }else{
+                communityBuildingManagerEntity= new CommunityBuildingManagerEntity();
+                communityBuildingManagerEntity.setIdCard(entity.getBuildingLeaderIdCard());
+                communityBuildingManagerEntity.setPhone(entity.getBuildingLeaderMobile());
+                communityBuildingManagerEntity.setType(entity.getBuildingLeaderType());
+                communityBuildingManagerEntity.setName(entity.getBuildingLeaderName());
+                communityBuildingManagerEntity.setBuildingId(entity.getId());
+                communityBuildingManagerEntity.setViliageId(entity.getNeighborHoodId());
+                IcNeighborHoodEntity neighborHood =  icNeighborHoodDao.selectById(entity.getNeighborHoodId());
+                communityBuildingManagerEntity.setGridId(neighborHood.getGridId());
+                communityBuildingManagerEntity.setOrgIdPath(neighborHood.getAgencyPids()+":"+neighborHood.getAgencyId()+":"+neighborHood.getGridId());
+
+                List<String> agencyIds = new ArrayList<>(Arrays.asList(neighborHood.getAgencyPids().split(":")));
+                agencyIds.add(neighborHood.getAgencyId());
+                LambdaQueryWrapper<CustomerAgencyEntity> queryWrapper = new LambdaQueryWrapper<CustomerAgencyEntity>().in(CustomerAgencyEntity::getId,agencyIds);
+                List<CustomerAgencyEntity> customerAgencyEntities = customerAgencyDao.selectList(queryWrapper);
+                for (CustomerAgencyEntity customerAgencyEntity : customerAgencyEntities) {
+                    if (customerAgencyEntity.getLevel().equals("community")){
+                        communityBuildingManagerEntity.setCommunityId(customerAgencyEntity.getId());
+                    }
+                    if (customerAgencyEntity.getLevel().equals("street")){
+                        communityBuildingManagerEntity.setStreetId(customerAgencyEntity.getId());
+                    }
+                    if (customerAgencyEntity.getLevel().equals("district")){
+                        communityBuildingManagerEntity.setDistrictId(customerAgencyEntity.getId());
+                    }
+                }
+                communityBuildingManagerDao.insert(communityBuildingManagerEntity);
+            }
+        }else{
+            if (communityBuildingManagerEntity!=null){
+                communityBuildingManagerDao.deleteById(communityBuildingManagerEntity);
+            }
+        }
+
         //设置楼宇单元
         Integer totalUnitNum = formDTO.getTotalUnitNum();
         List<IcBuildingUnitEntity> unitList = new ArrayList<>();
@@ -657,8 +710,8 @@ public class BuildingServiceImpl implements BuildingService {
         if (null != count && count > 0) {
             throw new RenException(EpmetErrorCode.BUILDING_NAME_EXITED.getCode(), EpmetErrorCode.BUILDING_NAME_EXITED.getMsg());
         }
-        IcNeighborHoodEntity neighborHood = icNeighborHoodDao.selectById(formDTO.getNeighborHoodId());
-        count = icBuildingDao.checkBuildNameV2(formDTO.getAgencyId(), neighborHood.getNeighborHoodName(), formDTO.getBuildingName(), formDTO.getBuildingId());
+        IcNeighborHoodEntity neighborHood1 = icNeighborHoodDao.selectById(formDTO.getNeighborHoodId());
+        count = icBuildingDao.checkBuildNameV2(formDTO.getAgencyId(), neighborHood1.getNeighborHoodName(), formDTO.getBuildingName(), formDTO.getBuildingId());
         if (null != count && count > 0) {
             throw new EpmetException(EpmetErrorCode.BUILDING_NAME_EXITED_IN_GRID.getCode());
         }
@@ -684,6 +737,57 @@ public class BuildingServiceImpl implements BuildingService {
         icBuildingDTO.setCustomerId(customerId);
         icBuildingService.update(icBuildingDTO);
 
+
+        LambdaQueryWrapper<CommunityBuildingManagerEntity> manager = new LambdaQueryWrapper<CommunityBuildingManagerEntity>().eq(CommunityBuildingManagerEntity::getBuildingId,icBuildingDTO.getId());
+        CommunityBuildingManagerEntity communityBuildingManagerEntity = communityBuildingManagerDao.selectOne(manager);
+
+
+        if (StringUtils.isNotBlank(icBuildingDTO.getBuildingLeaderType())&&
+                StringUtils.isNotBlank(icBuildingDTO.getBuildingLeaderIdCard())&&
+                StringUtils.isNotBlank(icBuildingDTO.getBuildingLeaderMobile())&&
+                StringUtils.isNotBlank(icBuildingDTO.getBuildingLeaderName())){
+
+            if (communityBuildingManagerEntity!=null){
+                communityBuildingManagerEntity.setIdCard(icBuildingDTO.getBuildingLeaderIdCard());
+                communityBuildingManagerEntity.setPhone(icBuildingDTO.getBuildingLeaderMobile());
+                communityBuildingManagerEntity.setType(icBuildingDTO.getBuildingLeaderType());
+                communityBuildingManagerEntity.setName(icBuildingDTO.getBuildingLeaderName());
+                communityBuildingManagerDao.updateById(communityBuildingManagerEntity);
+            }else{
+                communityBuildingManagerEntity= new CommunityBuildingManagerEntity();
+                communityBuildingManagerEntity.setIdCard(icBuildingDTO.getBuildingLeaderIdCard());
+                communityBuildingManagerEntity.setPhone(icBuildingDTO.getBuildingLeaderMobile());
+                communityBuildingManagerEntity.setType(icBuildingDTO.getBuildingLeaderType());
+                communityBuildingManagerEntity.setName(icBuildingDTO.getBuildingLeaderName());
+                communityBuildingManagerEntity.setBuildingId(icBuildingDTO.getId());
+                communityBuildingManagerEntity.setViliageId(icBuildingDTO.getNeighborHoodId());
+                IcNeighborHoodEntity neighborHood =  icNeighborHoodDao.selectById(icBuildingDTO.getNeighborHoodId());
+                communityBuildingManagerEntity.setGridId(neighborHood.getGridId());
+                communityBuildingManagerEntity.setOrgIdPath(neighborHood.getAgencyPids()+":"+neighborHood.getAgencyId()+":"+neighborHood.getGridId());
+
+                List<String> agencyIds = new ArrayList<>(Arrays.asList(neighborHood.getAgencyPids().split(":")));
+                agencyIds.add(neighborHood.getAgencyId());
+                LambdaQueryWrapper<CustomerAgencyEntity> queryWrapper = new LambdaQueryWrapper<CustomerAgencyEntity>().in(CustomerAgencyEntity::getId,agencyIds);
+                List<CustomerAgencyEntity> customerAgencyEntities = customerAgencyDao.selectList(queryWrapper);
+                for (CustomerAgencyEntity customerAgencyEntity : customerAgencyEntities) {
+                    if (customerAgencyEntity.getLevel().equals("community")){
+                        communityBuildingManagerEntity.setCommunityId(customerAgencyEntity.getId());
+                    }
+                    if (customerAgencyEntity.getLevel().equals("street")){
+                        communityBuildingManagerEntity.setStreetId(customerAgencyEntity.getId());
+                    }
+                    if (customerAgencyEntity.getLevel().equals("district")){
+                        communityBuildingManagerEntity.setDistrictId(customerAgencyEntity.getId());
+                    }
+                }
+                communityBuildingManagerDao.insert(communityBuildingManagerEntity);
+            }
+        }else{
+            if (communityBuildingManagerEntity!=null){
+                communityBuildingManagerDao.deleteById(communityBuildingManagerEntity);
+            }
+        }
+
         // 更新房屋名称
         icHouseDao.houseUpdateHouseName(formDTO.getBuildingId());
         //更新楼宇单元

From 3b6c6202e15ad270a6192ac2b00e38d48aeb6052 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 12 May 2023 15:38:57 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E7=89=A9=E4=B8=9A=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=8C=89=E7=85=A7=E7=AE=A1=E7=90=86=E5=B0=8F=E5=8C=BA=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=E9=99=8D=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/IcPropertyManagementDao.xml        | 42 ++++++++++++-------
 1 file changed, 28 insertions(+), 14 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPropertyManagementDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPropertyManagementDao.xml
index 88c1b8e2a0..64c35920e1 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPropertyManagementDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPropertyManagementDao.xml
@@ -71,19 +71,33 @@
     </select>
 
     <select id="queryList" parameterType="map" resultType="com.epmet.dto.IcPropertyManagementDTO">
-        select m.*
-        from ic_property_management m
-        where m.del_flag='0'
-          and m.customer_id=#{customerId}
-        <if test="name != null and name != ''">
-           and m.name like concat('%',#{name},'%')
-        </if>
-        <if test="contactName != null and contactName != ''">
-            and m.CONTACT_NAME like concat('%',#{contactName},'%')
-        </if>
-        <if test="contactMobile != null and contactMobile != ''">
-            and m.CONTACT_MOBILE like concat('%',#{contactMobile},'%')
-        </if>
-        order by m.CREATED_TIME desc
+        select * from (
+            select m.*,
+                   (
+                    SELECT
+                        count(p.NEIGHBOR_HOOD_ID)
+                    FROM
+                        ic_neighbor_hood_property p
+                    INNER JOIN ic_neighbor_hood h
+                        ON ( p.NEIGHBOR_HOOD_ID = h.ID )
+                    WHERE p.DEL_FLAG = '0'
+                    and p.PROPERTY_ID =m.id
+                    AND (h.AGENCY_ID = #{agencyId} or h.AGENCY_PIDS like concat('%',#{agencyId},'%') )
+                    AND h.DEL_FLAG = '0'
+                )as totalNeighborHood
+            from ic_property_management m
+            where m.del_flag='0'
+              and m.customer_id=#{customerId}
+            <if test="name != null and name != ''">
+               and m.name like concat('%',#{name},'%')
+            </if>
+            <if test="contactName != null and contactName != ''">
+                and m.CONTACT_NAME like concat('%',#{contactName},'%')
+            </if>
+            <if test="contactMobile != null and contactMobile != ''">
+                and m.CONTACT_MOBILE like concat('%',#{contactMobile},'%')
+            </if>
+        )t
+        order by t.totalNeighborHood desc,t.CREATED_TIME desc
     </select>
 </mapper>
\ No newline at end of file

From aecd032441d9057603157fab8294e97eddcbdde6 Mon Sep 17 00:00:00 2001
From: lichao <326994889@qq.com>
Date: Fri, 12 May 2023 15:47:20 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A5=BC=E6=B4=9E?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gov-org-server/src/main/resources/mapper/IcBuildingDao.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml
index 34d1023fa6..853d3dc59d 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml
@@ -463,7 +463,7 @@
         SELECT
             b.BUILDING_LEADER_ID_CARD as buildingLeaderIdCard,
             b.BUILDING_LEADER_TYPE as buildingLeaderType,
-            if(b.BUILDING_LEADER_TYPE = 0,'楼长',if(b.BUILDING_LEADER_TYPE = 1,'单元长','')) as buildingLeaderTypeName,
+            if(b.BUILDING_LEADER_TYPE = 0,'楼长',if(b.BUILDING_LEADER_TYPE = 1,'单元长',if(b.BUILDING_LEADER_TYPE = '0,1','楼长/单元长',if(b.BUILDING_LEADER_TYPE = '1,0','楼长/单元长','')))) as buildingLeaderTypeName,
             b.ID AS buildingId,
             b.BUILDING_NAME,
             b.NEIGHBOR_HOOD_ID,

From cf2d8be960e019504aad05fdafdd2b32bb030f8d Mon Sep 17 00:00:00 2001
From: lichao <326994889@qq.com>
Date: Fri, 12 May 2023 15:54:31 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E6=A5=BC=E6=B4=9E=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gov-org-server/src/main/resources/mapper/IcBuildingDao.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml
index 853d3dc59d..eb810ac14e 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml
@@ -463,7 +463,7 @@
         SELECT
             b.BUILDING_LEADER_ID_CARD as buildingLeaderIdCard,
             b.BUILDING_LEADER_TYPE as buildingLeaderType,
-            if(b.BUILDING_LEADER_TYPE = 0,'楼长',if(b.BUILDING_LEADER_TYPE = 1,'单元长',if(b.BUILDING_LEADER_TYPE = '0,1','楼长/单元长',if(b.BUILDING_LEADER_TYPE = '1,0','楼长/单元长','')))) as buildingLeaderTypeName,
+            if(b.BUILDING_LEADER_TYPE = '0','楼长',if(b.BUILDING_LEADER_TYPE = '1','单元长',if(b.BUILDING_LEADER_TYPE = '0,1','楼长/单元长',if(b.BUILDING_LEADER_TYPE = '1,0','楼长/单元长','')))) as buildingLeaderTypeName,
             b.ID AS buildingId,
             b.BUILDING_NAME,
             b.NEIGHBOR_HOOD_ID,