|
@@ -1104,7 +1104,12 @@ public class GkwxhwzyfzblhhzController extends BaseController {
|
|
|
String[] arrZyfs = fzsq.getZyfs().split(",");
|
|
|
for(String zyfsId : arrZyfs){
|
|
|
CodeEntity zyfsEntity = codeService.findOne(Long.parseLong(zyfsId));
|
|
|
- zyfs += zyfsEntity.getBz();
|
|
|
+ if(zyfs.isEmpty()){
|
|
|
+ zyfs = zyfsEntity.getBz();
|
|
|
+ } else {
|
|
|
+ zyfs += "," +zyfsEntity.getBz();
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
|
|
|
|
|
@@ -1660,7 +1665,12 @@ public class GkwxhwzyfzblhhzController extends BaseController {
|
|
|
String[] arrZyfs = fzsq.getZyfs().split(",");
|
|
|
for(String zyfsId : arrZyfs){
|
|
|
CodeEntity zyfsEntity = codeService.findOne(Long.parseLong(zyfsId));
|
|
|
- zyfs += zyfsEntity.getBz();
|
|
|
+ if(zyfs.isEmpty()){
|
|
|
+ zyfs = zyfsEntity.getBz();
|
|
|
+ } else {
|
|
|
+ zyfs += "," + zyfsEntity.getBz();
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
|
|
|
|
|
@@ -2222,6 +2232,19 @@ public class GkwxhwzyfzblhhzController extends BaseController {
|
|
|
List<WxhwzysqVo> dataList = new ArrayList<WxhwzysqVo>();
|
|
|
GkwxhwzyfzblhhzEntity gkwxhwzyfzData = gkwxhwzyfzblhhzService
|
|
|
.findOne(Long.parseLong(id));
|
|
|
+ if(gkwxhwzyfzData.getZyfs()!=null &&!"".equals(gkwxhwzyfzData.getZyfs())){
|
|
|
+ String zyfs = "";
|
|
|
+ String[] arrZyfs = gkwxhwzyfzData.getZyfs().split(",");
|
|
|
+ for(String zyfsId : arrZyfs){
|
|
|
+ CodeEntity zyfsEntity = codeService.findOne(Long.parseLong(zyfsId));
|
|
|
+ if(zyfs.isEmpty()){
|
|
|
+ zyfs = zyfsEntity.getBz();
|
|
|
+ } else {
|
|
|
+ zyfs += "," +zyfsEntity.getBz();
|
|
|
+ }
|
|
|
+ }
|
|
|
+ gkwxhwzyfzData.setZyfs(zyfs);
|
|
|
+ }
|
|
|
// 附证场所
|
|
|
List<GkwxhwzyfzblFzEntity> csfzList = gkwxhwzyfzblhhzService
|
|
|
.findByFzsq(gkwxhwzyfzData.getId());
|