Merge remote-tracking branch 'origin/dev-mysql' into dev-mysql

src/main/java/com/uas/platform/b2c/common/account/controller/AuthenticationController.java

@@ -11,6 +11,8 @@ import com.uas.platform.b2c.common.account.service.UserQuestionService;
 import com.uas.platform.b2c.common.account.service.UserService;
 import com.uas.platform.b2c.core.support.SystemSession;
 import java.util.List;
+
+import com.uas.platform.core.model.Constant;
 import net.sf.ehcache.CacheManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -46,6 +48,9 @@ public class AuthenticationController {
 		List<UserQuestion> userQuestion = userQuestionService.findUserQuestionByUserUUOrderBySortAsc(sysUser.getUserUU());
 		User user = userService.findUserByUserUU(sysUser.getUserUU());
 		user.setEnterprise(sysUser.getEnterprise());
+		if (user.getEnterprise().getEnAdminuu().equals(user.getUserUU())) {
+			user.setIssys(Constant.YES);
+		}
 		UserInfo userInfo = new UserInfo(user);
 		if(userQuestion!=null){
 			if(userQuestion.size()>0){

src/main/java/com/uas/platform/b2c/core/filter/SSOInterceptor.java

@@ -270,6 +270,9 @@ public class SSOInterceptor extends AbstractSSOInterceptor {
                 }
             }
         }
+        if (user.getEnterprise().getEnAdminuu().equals(user.getUserUU())) {
+            user.setIssys(Constant.YES);
+        }
         if (authorities == null) {
             authorities = new HashMap<Long, Collection<GrantedAuthority>>();
         }

src/main/java/com/uas/platform/b2c/external/erp/prod/service/impl/ProdServiceImpl.java

@@ -180,7 +180,10 @@ public class ProdServiceImpl implements ProdService {
                 productPrivate.setBatchCount(batchCount);
                 productPrivateDao.save(productPrivate);
             }
+            return "success";
+        } else {
+            return "fail";
         }
-        return "success";
+
     }
 }

src/main/webapp/resources/view/vendor/forstore/vendor_upload.html

@@ -661,7 +661,7 @@
                             </tbody>
                         </table>
                         <div style="margin-top: -40px;" ng-if="$$productOn.tab == 'bathOn'">3、如核对信息无误之后，点击确认发布</div>
-                        <span class="blue-bg publish" href="javascript:void(0)" ng-click="publish($event)" ng-disabled="!pageParams.totalElements" ng-show="$$productOn.tab == 'bathOn'"><span>确认上架</span></>
+                        <span class="blue-bg publish" href="javascript:void(0)" ng-click="publish($event)" ng-disabled="!pageParams.totalElements" ng-show="$$productOn.tab == 'bathOn'"><span>确认上架</span></span>
                     </div>
                 </div>
                 <!--<div class="load_next">-->