Merge pull request 'dev' (#11) from dev into master

Reviewed-on: http://47.92.149.153:3000/tangzp/mztb-parent/pulls/11

mztb/src/main/java/cc/smtweb/biz/mztb/web/controller/MztbController.java

@@ -108,14 +108,17 @@ public class MztbController {
                     userStatuListExist.add(userStatuList.get(index));
                     ptIdListExist.add(ptIdList.get(index));
                 }
+                partyInfo.setId(instance.nextId());
                 existPartyMap.put(map.get("pi_credit_code") + "", insertIndex);
                 insertIndex++;
 
                 Party party = new Party(); // 底层机构表
                 party.init();
-                long ptId = Long.parseLong(map.get("pi_id") + "");
-                party.setId(ptId);
-                party.setCode(ptId + "");
+//                long ptId = Long.parseLong(map.get("pi_id") + "");
+//                party.setId(ptId);
+//                party.setCode(ptId + "");
+                party.setId(partyInfo.getId());
+                party.setCode(partyInfo.getId() + "");
                 party.setName(partyInfo.getPartyName());
                 party.setType(101);
                 party.setAreaId(Long.parseLong(partyInfo.getAreaCode()));
@@ -123,7 +126,7 @@ public class MztbController {
                 sysPartyList.add(party);
                 partysInsertList.add(partyInfo);
                 // 添加机构id
-                ptIdList.add(ptId + "");
+                ptIdList.add(partyInfo.getId() + "");
 
                 User user = new User(); // 底层用户表
                 user.init();
@@ -146,14 +149,14 @@ public class MztbController {
                 dept.setCode(RandomUtil.randomString(8));
                 dept.setName("填报部门");
                 dept.setType("100");
-                dept.setPtId(ptId);
+                dept.setPtId(partyInfo.getId());
                 dept.setStatu(0);
                 deptList.add(dept);
 
                 UserParty userParty = new UserParty(); //用户机构关联表
                 long userPartyId = instance.nextId();
                 userParty.setId(userPartyId);
-                userParty.setPartyId(ptId);
+                userParty.setPartyId(partyInfo.getId());
                 userParty.setUserId(userId);
                 userParty.setDeptId(deptId); // 关联部门表
                 userPartyList.add(userParty);