企业信息修改

src/main/java/com/uas/platform/b2c/common/account/v2/service/impl/EnterpriseServiceImpl.java

@@ -41,12 +41,17 @@ public class EnterpriseServiceImpl implements EnterpriseService {
             logger.log("更新企业信息出错，管理员有且仅有一个", "当前管理员数量:" + admins.size());
             return;
         }*/
-        Enterprise enterprise = new Enterprise();
         if (null == userSpaceView.getSpaceUU() && "".equals(userSpaceView.getSpaceUU())){
             logger.log("更新企业信息出错，uu为空", "值为null", null,0L);
             return;
         }
-        Enterprise oldenterprise = enterpriseDao.findByUu(Long.valueOf(userSpaceView.getSpaceUU()));
+        Enterprise enterprise;
+        Enterprise oldenterprise;
+        enterprise = enterpriseDao.findByUu(Long.valueOf(userSpaceView.getSpaceUU()));
+        oldenterprise = enterprise;
+        if (enterprise == null || enterprise.getUu() == null) {
+            enterprise = new Enterprise();
+        }
         enterprise.setEnAddress(userSpaceView.getRegAddress());
         //enterprise.setEnArea(userSpaceView.get());
         enterprise.setEnCorporation(userSpaceView.getCorporation());
@@ -74,7 +79,7 @@ public class EnterpriseServiceImpl implements EnterpriseService {
             enterprise.setEnAdminuu(adminUser.getUserUU());
             userDao.save(adminUser);
         }*/
-        if(null != oldenterprise) {
+        if(oldenterprise != null && oldenterprise.getUu() != null) {
             logger.log("更新企业信息", enterprise.getUu()+"time: " + sdf.format(new Date()), enterprise.getUu(), 0L);
         } else {
             logger.log("新增企业信息", enterprise.getUu()+"time: " + sdf.format(new Date()), enterprise.getUu(), 0L);