添加用户

atms-api/src/main/java/pwc/taxtech/atms/service/impl/UserAccountServiceImpl.java

@@ -300,7 +300,8 @@ public class UserAccountServiceImpl extends AbstractService {
         user.setLoginType(UserLoginType.ExternalUser);
         List<UserRole> userRoleList = new ArrayList<>();
         // new password
-        String newPwd = stringHelper.generateRandomPassword();
+//        String newPwd = stringHelper.generateRandomPassword();
+        String newPwd = "12345678";//todo 没有发邮件，先默认这个
         user.setPassword(atmsPasswordEncoder.encode(newPwd));
         user.setCreateTime(
                 userAndUserRoleSaveDto.getCreateTime() == null ? new Date() : userAndUserRoleSaveDto.getCreateTime());

atms-web/src/main/webapp/bundles/adminHomePage.js

-/*! atms-web 2018-10-17 */
+/*! atms-web 2018-10-24 */
 
 adminHomePageModule.controller("AdminHomePageController",["$scope","$log","SweetAlert","$translate","menuService","$timeout","userService","loginContext","Upload","apiInterceptor","dataInitService",function(i,a,o,r,n,t,e,l,s,m,u){"use strict";var c=["../../../app-resources/images/admin_hover__1__03.png","../../../app-resources/images/admin_hover__1__05.png","../../../app-resources/images/admin_hover__1__07.png"],d=m.webApiHostUrl+"/init/Upload";i.hasAdminPermission=!1;i.selectMenu=function(e){},i.menuMouseOver=function(e){if(!e.isOpen&&i.menuData&&0<i.menuData.length)for(var n=0;n<i.menuData.length;n++){var t=i.menuData[n];e.id===t.id?t.isOpen=!0:t.isOpen=!1}},i.GoPage=function(e){},i.showUploadModal=function(){i.triggered=!1,i.completed=!1,i.importMsgList="",i.file&&(i.file=null),$("#importBasicData").modal("show")};var p;i.ImportData=function(){!function(e){if(i.file&&i.file.name){var n=PWC.newGuid()+".dat",t=$('input[name="__RequestVerificationToken"]').val();s.upload({url:d,data:{cancel:!1,enterpriseAccountID:i.accountSetID,filename:i.file.name,tempFileName:n,action:e},file:i.file,resumeChunkSize:i.chunkSize,headers:{"Access-Control-Allow-Origin":"*",Authorization:m.tokenType+" "+m.apiToken(),__RequestVerificationToken:t,withCredentials:!0},withCredentials:!0}).then(function(e){i.importMsgList=e.data.validMsg,i.completed=!0},function(e){console.log("Error status: "+e.status)},function(e){var n=parseInt(100*e.loaded/e.total);a.debug("progress: "+n+"% "+e.config.data.file.name)})}else o.warning(r.instant("SelectCustomerFileRequired"))}(constant.import.overwrite),i.triggered=!0},i.downloadTemplate=function(){u.downloadTemplate()},i.open=!1,p="1",e.getUserPermissionNew(l.userName,function(e){e&&e.isAdmin&&(i.hasAdminPermission=!0),t(function(){n.getMenusNew(p,function(e){if(i.menuData=e,i.menuData&&0<i.menuData.length)for(var n=0;n<i.menuData.length;n++){var t=n%c.length,a=i.menuData[n];a.firstMenuClass=(a.popoverPlacement=0===t?"bottom-left":"bottom","menu-wrapper"),a.imageUrl=c[t],a.templateUrl="myPopoverTemplate.html",a.subMenus&&(a.subMenus=_.filter(a.subMenus,function(e){return e.isVisible}))}})},1e3)})}]),adminHomePageModule.directive("adminHomePage",["$log",function(e){"use strict";return e.debug("adminHomePage.ctor()..."),console.log("adminHomePagector"),{restrict:"E",templateUrl:"/app/admin/homePage/admin-home-page.html?_="+Math.random(),replace:!0,scope:{},controller:"AdminHomePageController",link:function(e,n){}}}]);
\ No newline at end of file