Merge branch 'feature/customer_1.0' into develop

.idea/.gitignore

@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
+# Editor-based HTTP Client requests
+/httpRequests/

.idea/misc.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GOROOT" path="$USER_HOME$/Go/go1.19.3" />
+</project>

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/opms_backend.iml" filepath="$PROJECT_DIR$/.idea/opms_backend.iml" />
+    </modules>
+  </component>
+</project>

.idea/opms_backend.iml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

opms_admin/app/service/sys_user.go

@@ -294,6 +294,7 @@ func (s *userService) CreateUser(req *model.AddUserReq) (err error) {
 	}
 	userData.UserSalt = grand.S(10)
 	userData.Password = utils.EncryptPassword(userData.Password, userData.UserSalt)
+	g.Log("xxxxpassword",userData.Password)
 	SetCreatedInfo(userData, s.GetCxtUserId(), s.GetCxtUserName())
 	res, err := Model.Insert(userData)
 	if err != nil {

opms_parent/app/handler/base/product.go

@@ -85,12 +85,14 @@ func (p *ProductHandler) GetEntityById(ctx context.Context, req *comm_def.IdReq,
 		g.Log().Error(err)
 		return gerror.New("系统异常，请重新尝试")
 	}
-	_, err = productServer.GetEntityById(req.Id)
+	list, err := productServer.GetEntityById(req.Id)
+
 	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
 		g.Log().Error(err)
 		return err
 	}
+	rsp.Data = g.Map{"list": list}
 	return nil
 }
 

opms_parent/app/model/cust/cust_customer_dynamics.go

@@ -5,7 +5,6 @@
 package cust
 
 import (
-	"dashoo.cn/opms_libary/request"
 	"github.com/gogf/gf/os/gtime"
 
 	"dashoo.cn/micro/app/model/cust/internal"
@@ -28,7 +27,7 @@ type AddCustomerDynameicsReq struct {
 }
 type CustomerDynameicsReq struct {
 	CustId int `    json:"custId"` // 客户Id
-	request.PageReq
+	//request.PageReq
 }
 
 //客户表动态记录

opms_parent/app/service/cust/cust_customer.go

@@ -500,11 +500,11 @@ func (c *CustomerService) DynamicsList(req *model.CustomerDynameicsReq) (total i
 		err = gerror.New("获取总行数失败")
 		return
 	}
-	if req.PageNum == 0 {
-		req.PageNum = 1
-	}
+	//if req.PageNum == 0 {
+	//	req.PageNum = 1
+	//}
 	dynamics := []*model.CustomerDynameicsRep{}
-	err = Model.Page(req.PageNum, req.PageSize).Where("cust_id = ", req.CustId).Order("created_time desc").Scan(&dynamics)
+	err = Model.Where("cust_id = ", req.CustId).Order("created_time desc").Scan(&dynamics)
 	dynamicsList := make(map[string][]*model.CustomerDynameicsRep)
 
 	for _, v := range dynamics {
@@ -518,19 +518,9 @@ func (c *CustomerService) DynamicsList(req *model.CustomerDynameicsReq) (total i
 		})
 
 	}
-	g.Log().Info("DynamicsList----", dynamics)
-	//var ks []string
-	//for k, _ := range dynamicsList {
-	//	ks = append(ks, k)
-	//}
-	//sort.Sort(sort.Reverse(ks))
-	result = append(result, dynamicsList)
-	//var sslice []string
-	//for key, _ := range result {
-	//	sslice = append(sslice, key)
-	//}
-	//sort.Strings(sslice)
 
+	g.Log().Info("DynamicsList----", dynamicsList)
+	result = append(result, dynamicsList)
 	g.Log().Info("Dy---", result)
 	return
 }