修复SQL错误

src/main/java/com/uas/saas/admin/repository/ManageRepository.java

@@ -25,7 +25,7 @@ public class ManageRepository {
                             "en_bussinesscodeimg,en_tel,en_address,en_administrator," +
                             "en_admintel,en_adminemail,en_adminname,en_adminuu,en_saasurl,en_b2burl) values (?,?,?,?," +
                             "?,?,?,?,?,?,?,?,?,?)", space.getSpaceUU(), space.getSpaceName(), space.getSpaceName(),
-                    space.getBusinessCode(), space.getBusinessCodeImage(), (null != admin ? admin.getMobile() : null),
+                    space.getBusinessCode(), null, (null != admin ? admin.getMobile() : null),
                     space.getRegAddress(), (null != admin ? admin.getVipName() : null),
                     (null != admin ? admin.getMobile() : null), (null != admin ? admin.getEmail() : null),
                     (null != admin ? admin.getVipName() : null), (null != admin ? admin.getUserUU() : null),
@@ -35,7 +35,7 @@ public class ManageRepository {
                             "en_bussinesscodeimg=?,en_tel=?,en_address=?,en_administrator=?," +
                             "en_admintel=?,en_adminemail=?,en_adminname=?,en_adminuu=?,en_saasurl=?,en_b2burl=? " +
                             "where enuu=?", space.getSpaceName(), space.getSpaceName(),
-                    space.getBusinessCode(), space.getBusinessCodeImage(), (null != admin ? admin.getMobile() : null),
+                    space.getBusinessCode(), null, (null != admin ? admin.getMobile() : null),
                     space.getRegAddress(), (null != admin ? admin.getVipName() : null),
                     (null != admin ? admin.getMobile() : null), (null != admin ? admin.getEmail() : null),
                     (null != admin ? admin.getVipName() : null), (null != admin ? admin.getUserUU() : null),

src/main/java/com/uas/saas/admin/repository/SchemaRepository.java

@@ -48,18 +48,38 @@ public class SchemaRepository {
     public void setBaseData(Master master, UserSpaceView space, Setting setting) {
         UserView admin = space.getAdmin();
         // 写入企业信息、管理员信息
-        jdbcTemplate.update(
-                "insert into "
-                        + master.getMa_user()
-                        + ".enterprise(en_id,en_uu,en_name,en_shortname,en_address,en_deliveraddr,en_adminname,en_tel,en_adminphone,en_adminemail,en_erpurl,en_url,en_printurl,en_whichsystem,init,en_adminuu,en_type,en_b2bwebsite,en_admin,en_businesscode) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,0,?,?,?,?,?)",
-                space.getSpaceUU(), space.getSpaceUU(), space.getSpaceName(), space.getSpaceName(), space.getRegAddress(),
-                space.getRegAddress(), (null != admin ? admin.getVipName() : null), (null != admin ? admin.getMobile() : null), (null != admin ? admin.getMobile() : null), (null != admin ? admin.getEmail() : null),
-                master.getWebsite(), setting.getPrint_url(), setting.getPrint_url(), master.getMa_user(), (null != admin ? admin.getUserUU() : null), setting.getSchema_type(), setting.getB2b_url(), setting.getPrint_type(), space.getBusinessCode());
-        jdbcTemplate.update(
-                "insert into "
-                        + master.getMa_user()
-                        + ".employee(em_id,em_uu,em_code,em_password,em_name,em_sex,em_status,em_statuscode,em_enid,em_type,em_class,em_b2benable) values(employee_seq.nextval,?,'ADMIN',?,?,'男','已审核','AUDITED',?,'admin','正式',1)",
-                (null != admin ? admin.getUserUU() : null), null, (null != admin ? admin.getVipName() : "管理员"), space.getSpaceUU());
+        int count = jdbcTemplate.queryForObject("select count(1) from " + master.getMa_user() + ".enterprise where en_id=?", Integer.class, space.getSpaceUU());
+        if (count == 0) {
+            jdbcTemplate.update(
+                    "insert into "
+                            + master.getMa_user()
+                            + ".enterprise(en_id,en_uu,en_name,en_shortname,en_address,en_deliveraddr,en_adminname,en_tel,en_adminphone,en_adminemail,en_erpurl,en_url,en_printurl,en_whichsystem,init,en_adminuu,en_type,en_b2bwebsite,en_admin,en_businesscode) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,0,?,?,?,?,?)",
+                    space.getSpaceUU(), space.getSpaceUU(), space.getSpaceName(), space.getSpaceName(), space.getRegAddress(),
+                    space.getRegAddress(), (null != admin ? admin.getVipName() : null), (null != admin ? admin.getMobile() : null), (null != admin ? admin.getMobile() : null), (null != admin ? admin.getEmail() : null),
+                    master.getWebsite(), setting.getPrint_url(), setting.getPrint_url(), master.getMa_user(), (null != admin ? admin.getUserUU() : null), setting.getSchema_type(), setting.getB2b_url(), setting.getPrint_type(), space.getBusinessCode());
+        } else {
+            jdbcTemplate.update(
+                    "update "
+                            + master.getMa_user()
+                            + ".enterprise set en_uu=?,en_name=?,en_shortname=?,en_address=?,en_deliveraddr=?,en_adminname=?,en_tel=?,en_adminphone=?,en_adminemail=?,en_erpurl=?,en_url=?,en_printurl=?,en_whichsystem=?,en_adminuu=?,en_type=?,en_b2bwebsite=?,en_admin=?,en_businesscode=? where en_id=?",
+                    space.getSpaceUU(), space.getSpaceName(), space.getSpaceName(), space.getRegAddress(),
+                    space.getRegAddress(), (null != admin ? admin.getVipName() : null), (null != admin ? admin.getMobile() : null), (null != admin ? admin.getMobile() : null), (null != admin ? admin.getEmail() : null),
+                    master.getWebsite(), setting.getPrint_url(), setting.getPrint_url(), master.getMa_user(), (null != admin ? admin.getUserUU() : null), setting.getSchema_type(), setting.getB2b_url(), setting.getPrint_type(), space.getBusinessCode(), space.getSpaceUU());
+        }
+        count = jdbcTemplate.queryForObject("select count(1) from " + master.getMa_user() + ".employee where em_mobile=?", Integer.class, admin.getMobile());
+        if (count == 0) {
+            jdbcTemplate.update(
+                    "insert into "
+                            + master.getMa_user()
+                            + ".employee(em_id,em_uu,em_code,em_password,em_name,em_sex,em_status,em_statuscode,em_enid,em_type,em_class,em_b2benable,em_mobile,em_email) values(employee_seq.nextval,?,'ADMIN',?,?,'男','已审核','AUDITED',?,'admin','正式',1,?,?)",
+                    (null != admin ? admin.getUserUU() : null), "111111", (null != admin ? admin.getVipName() : "管理员"), space.getSpaceUU(), admin.getMobile(), admin.getEmail());
+        } else {
+            jdbcTemplate.update(
+                    "update "
+                            + master.getMa_user()
+                            + ".employee set em_uu=?,em_name=?,em_status='已审核',em_statuscode='AUDITED',em_enid=?,em_type='admin',em_class='正式',em_email=? where em_mobile=?",
+                    (null != admin ? admin.getUserUU() : null), (null != admin ? admin.getVipName() : "管理员"), space.getSpaceUU(), admin.getMobile(), admin.getEmail());
+        }
     }
 
     /**
@@ -115,16 +135,16 @@ public class SchemaRepository {
         UserView view = user.getUser();
         if (isUserMobileExists(master, user.getMobile())) {
             jdbcTemplate.update("update " + master.getMa_user() + ".employee set em_code=?,em_uu=?,em_imid=?," +
-                            "em_email=?,em_iccode=?,em_sex=?,em_type=? where em_mobile=?",
+                            "em_email=?,em_iccode=?,em_sex=?,em_type=?,em_name=? where em_mobile=?",
                     user.getCode(), (null != view ? view.getUserUU() : null), (null != view ? view.getImId() : null),
-                    user.getEmail(), (null != view ? view.getIdCard() : null), user.getSex(), user.getType(), user.getMobile());
+                    user.getEmail(), (null != view ? view.getIdCard() : null), user.getSex(), user.getType(), user.getName(), user.getMobile());
         } else {
             jdbcTemplate.update("insert into " + master.getMa_user() + ".employee(em_code,em_mobile,em_uu,em_imid,em_depart,em_defaultorname," +
                             "em_email,em_iccode,em_password,em_position,em_defaulthsname,em_sex,em_status,em_statuscode," +
-                            "em_class,em_type,em_enid,em_id) values (?,?,?,?,?,?,?,?,?,?,?,?,'已审核','AUDITED','正式',?,?," +
-                            "employee_seq.nextval)", user.getCode(), user.getMobile(), (null != view ? view.getUserUU() : null),
+                            "em_class,em_type,em_enid,em_id,em_name) values (?,?,?,?,?,?,?,?,?,?,?,?,'已审核','AUDITED','正式',?,?," +
+                            "employee_seq.nextval,?)", user.getCode(), user.getMobile(), (null != view ? view.getUserUU() : null),
                     (null != view ? view.getImId() : null), user.getDepartment(), user.getDepartment(), user.getEmail(),
-                    (null != view ? view.getIdCard() : null), "111111", user.getJob(), user.getJob(), user.getSex(), user.getType(), master.getMa_uu());
+                    (null != view ? view.getIdCard() : null), "111111", user.getJob(), user.getJob(), user.getSex(), user.getType(), master.getMa_uu(), user.getName());
         }
         String dpCode = getDepartmentCode(master, user.getDepartment());
         if (null != dpCode) {